diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-09 11:52:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-09 11:52:34 -0700 |
| commit | 78ebf0e349421156fe70f437ce6ce3daf068ef56 (patch) | |
| tree | acaa76a2e3dd6c7cd9377e071999fecebf464bf0 /arch/arm | |
| parent | 6a9331666170d8b2bef70eed176793c7efe68c33 (diff) | |
| parent | 70a0f6032985f156bd7e957cfec99c3dd3d592a2 (diff) | |
Merge tag 'fbdev-fixes-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev fixes from Tomi Valkeinen:
- omapdss: compilation fix and DVI fix for PandaBoard
- mxsfb: fix colors when using 18bit LCD bus
* tag 'fbdev-fixes-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
ARM: OMAP: dss-common: fix Panda's DVI DDC channel
video: mxsfb: fix color settings for 18bit data bus and 32bpp
OMAPDSS: analog-tv-connector: compile fix
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/dss-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/dss-common.c b/arch/arm/mach-omap2/dss-common.c index 393aeefaebb0..043e5705f2a6 100644 --- a/arch/arm/mach-omap2/dss-common.c +++ b/arch/arm/mach-omap2/dss-common.c @@ -42,7 +42,7 @@ /* Using generic display panel */ static struct tfp410_platform_data omap4_dvi_panel = { - .i2c_bus_num = 3, + .i2c_bus_num = 2, .power_down_gpio = PANDA_DVI_TFP410_POWER_DOWN_GPIO, }; |