diff options
| author | Jack Lee <jack.lee@freescale.com> | 2012-10-30 12:32:50 +0800 |
|---|---|---|
| committer | Jack Lee <jack.lee@freescale.com> | 2012-10-30 12:32:50 +0800 |
| commit | aaf9d00bf48472e7c21705665beb48169947e6a9 (patch) | |
| tree | 2283f5ac774264df2b21539d984197dcfa16d763 /drivers/video/mxc/Kconfig | |
| parent | 6ece2da0d75746fad5ddf93efd6d323ab3c4414c (diff) | |
| parent | 94689e1fed43ece131451a90f1716893a418cba0 (diff) | |
Merge commit 'rel_imx_3.0.35_12.10.02_RC2' into imx_3.0.35_android_r13.5-ga
Conflicts:
arch/arm/mach-mx6/pm.c
Signed-off-by: Jack Lee <jack.lee@freescale.com>
Diffstat (limited to 'drivers/video/mxc/Kconfig')
| -rw-r--r-- | drivers/video/mxc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/mxc/Kconfig b/drivers/video/mxc/Kconfig index 8a4a0792724f..83b094267760 100644 --- a/drivers/video/mxc/Kconfig +++ b/drivers/video/mxc/Kconfig @@ -61,7 +61,7 @@ config FB_MXC_SII902X tristate "Si Image SII9022 DVI/HDMI Interface Chip" config FB_MXC_SII902X_ELCDIF - depends on FB_MXC_SYNC_PANEL && I2C + depends on FB_MXC_ELCDIF_FB && FB_MXC_SYNC_PANEL && I2C tristate "Si Image SII9022 DVI/HDMI Interface Chip for ELCDIF FB" config FB_MXC_CH7026 |