aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/mach
diff options
context:
space:
mode:
authorUwe Kleine-Koenig <ukl@pengutronix.de>2008-12-12 11:18:54 +0100
committerUwe Kleine-Koenig <ukl@pengutronix.de>2008-12-12 11:18:54 +0100
commit7971db5a4b4176ad5df590fce07a962c643a2740 (patch)
tree6ad8e09c5376c4e4c532c3411b0171ba1011acd9 /arch/arm/plat-omap/include/mach
parentd403700bf8fc903584e830967f5d64075770848c (diff)
parentc4edfced662fa64deeed89c7d8c9f96d86130c19 (diff)
downloadkernel_samsung_smdk4412-7971db5a4b4176ad5df590fce07a962c643a2740.zip
kernel_samsung_smdk4412-7971db5a4b4176ad5df590fce07a962c643a2740.tar.gz
kernel_samsung_smdk4412-7971db5a4b4176ad5df590fce07a962c643a2740.tar.bz2
Merge branch 'for-rmk-misc' into for-rmk
Diffstat (limited to 'arch/arm/plat-omap/include/mach')
-rw-r--r--arch/arm/plat-omap/include/mach/omapfb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/mach/omapfb.h b/arch/arm/plat-omap/include/mach/omapfb.h
index ec67fb4..7b74d12 100644
--- a/arch/arm/plat-omap/include/mach/omapfb.h
+++ b/arch/arm/plat-omap/include/mach/omapfb.h
@@ -353,8 +353,8 @@ struct omapfb_device {
u32 pseudo_palette[17];
struct lcd_panel *panel; /* LCD panel */
- struct lcd_ctrl *ctrl; /* LCD controller */
- struct lcd_ctrl *int_ctrl; /* internal LCD ctrl */
+ const struct lcd_ctrl *ctrl; /* LCD controller */
+ const struct lcd_ctrl *int_ctrl; /* internal LCD ctrl */
struct lcd_ctrl_extif *ext_if; /* LCD ctrl external
interface */
struct device *dev;