gma500: Fix DPU build
authorAlan Cox <alan@linux.intel.com>
Fri, 15 Jul 2011 16:46:58 +0000 (17:46 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 15 Jul 2011 17:12:15 +0000 (19:12 +0200)
commitc603685443208fa6c52d5080637b36bf7092ac69
treefed20f7dedf216f9b678c854fc2b2346fba6311b
parent3a970ac1b14cf1a49076d69369aa75a23d4ad2db
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>
drivers/staging/gma500/mdfld_dsi_dbi.h
drivers/staging/gma500/mdfld_dsi_dbi_dpu.c