diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-15 17:13:26 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-15 17:13:26 -0500 |
| commit | 7e1548a597ef7e26d5d62f8be3be6da9e101b26c (patch) | |
| tree | fe6cbf4d9a3c1afdba04fb276fef0f932403727c /arch/arm/plat-omap/include/mach/omapfb.h | |
| parent | 1f7f569c0ae6e619504095eabf796edd712d943d (diff) | |
| parent | 2619bc327417f549f1c89d5ef9b4a4aa768f41a2 (diff) | |
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Diffstat (limited to 'arch/arm/plat-omap/include/mach/omapfb.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/omapfb.h | 4 |
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 ec67fb42860..7b74d1255e0 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 { | |||
| 353 | u32 pseudo_palette[17]; | 353 | u32 pseudo_palette[17]; |
| 354 | 354 | ||
| 355 | struct lcd_panel *panel; /* LCD panel */ | 355 | struct lcd_panel *panel; /* LCD panel */ |
| 356 | struct lcd_ctrl *ctrl; /* LCD controller */ | 356 | const struct lcd_ctrl *ctrl; /* LCD controller */ |
| 357 | struct lcd_ctrl *int_ctrl; /* internal LCD ctrl */ | 357 | const struct lcd_ctrl *int_ctrl; /* internal LCD ctrl */ |
| 358 | struct lcd_ctrl_extif *ext_if; /* LCD ctrl external | 358 | struct lcd_ctrl_extif *ext_if; /* LCD ctrl external |
| 359 | interface */ | 359 | interface */ |
| 360 | struct device *dev; | 360 | struct device *dev; |