diff options
| author |   Dave Airlie <airlied@redhat.com> | 2013-08-19 13:49:20 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-08-19 13:49:20 +1000 |
| commit | 3387ed83943daf6cb1bb4195ae369067b9cd80ce (patch) | |
| tree | e9fc247ed3a26f5369a7ec1b1bd0ef66bda7b4dd /arch/arm/mach-omap2/dss-common.c | |
| parent | drm/i915: unpin backing storage in dmabuf_unmap (diff) | |
| parent | drm/i915: Don't deref pipe->cpu_transcoder in the hangcheck code (diff) | |
| download | linux-dev-3387ed83943daf6cb1bb4195ae369067b9cd80ce.tar.xz linux-dev-3387ed83943daf6cb1bb4195ae369067b9cd80ce.zip | |
Merge tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danvet/drm-intel
* tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danvet/drm-intel: (153 commits)
drm/i915: Don't deref pipe->cpu_transcoder in the hangcheck code
Diffstat (limited to 'arch/arm/mach-omap2/dss-common.c')
| -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, }; |