From 0f6287309f0936a69ccbea77cd89650bac870d4e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 3 Jul 2012 13:22:16 -0300 Subject: [PATCH] --- yaml --- r: 313079 b: refs/heads/master c: 4e28f3a0e43f4b2c99dc4870e7af4acadb892f61 h: refs/heads/master i: 313077: cd83fbd23b09bd82b6a3daef0134b144336cc8f0 313075: 5bf84a852e22bec916b4389ff81b63041f67ea63 313071: 04fa292cd0b951070fee286e6e3550d651f6492e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/Kconfig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9f3dd4f71c7d..b37185ce08f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e386565e14175c57dee50281613c4bd1865f5d3 +refs/heads/master: 4e28f3a0e43f4b2c99dc4870e7af4acadb892f61 diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig index 0021f726b153..048ec35e298a 100644 --- a/trunk/arch/arm/mach-imx/Kconfig +++ b/trunk/arch/arm/mach-imx/Kconfig @@ -158,7 +158,6 @@ config MACH_MX25_3DS select IMX_HAVE_PLATFORM_IMX2_WDT select IMX_HAVE_PLATFORM_IMXDI_RTC select IMX_HAVE_PLATFORM_IMX_I2C - select IMX_HAVE_PLATFORM_IMX_SSI select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_IMX_KEYPAD select IMX_HAVE_PLATFORM_IMX_UART