From: Alan Cox <alan@linux.intel.com>
Date: Fri, 15 Jul 2011 16:46:58 +0000 (+0100)
Subject: gma500: Fix DPU build
X-Git-Tag: v3.1-rc1~232^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c603685443208fa6c52d5080637b36bf7092ac69;p=pandora-kernel.git

gma500: Fix DPU build

Fix up the merge build

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

Reading git-diff-tree failed