From bdf1660d818f440832cebde1a7f53fd2ebbd8e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Thu, 11 Nov 2010 18:11:29 +0100 Subject: [PATCH] --- yaml --- r: 226073 b: refs/heads/master c: fd2fa2e3238197ef10101277dff67da10e68a61b h: refs/heads/master i: 226071: 2037181e269aa22250de9fd195a5e4081deac791 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/Kconfig | 3 +-- trunk/arch/arm/plat-mxc/devices/Kconfig | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5951cdb0b44b..d64dca158daf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e48ab1c16ff2af83e6a2a1228504710a5d339d08 +refs/heads/master: fd2fa2e3238197ef10101277dff67da10e68a61b diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig index 176984f22a07..6875cdfbb282 100644 --- a/trunk/arch/arm/mach-imx/Kconfig +++ b/trunk/arch/arm/mach-imx/Kconfig @@ -17,9 +17,8 @@ config SOC_IMX21 config SOC_IMX25 bool select CPU_ARM926T - select ARCH_MXC_IOMUX_V3 - select HAVE_FB_IMX select ARCH_MXC_AUDMUX_V2 + select ARCH_MXC_IOMUX_V3 config SOC_IMX27 bool diff --git a/trunk/arch/arm/plat-mxc/devices/Kconfig b/trunk/arch/arm/plat-mxc/devices/Kconfig index 81d7a5456920..dbb2078ee4a1 100644 --- a/trunk/arch/arm/plat-mxc/devices/Kconfig +++ b/trunk/arch/arm/plat-mxc/devices/Kconfig @@ -27,6 +27,7 @@ config IMX_HAVE_PLATFORM_IMXDI_RTC config IMX_HAVE_PLATFORM_IMX_FB bool + select HAVE_FB_IMX config IMX_HAVE_PLATFORM_IMX_I2C bool