From: Fabio Estevam Date: Tue, 3 Jul 2012 16:22:16 +0000 (-0300) Subject: ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS X-Git-Tag: v3.6-rc1~147^2~6^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e28f3a0e43f4b2c99dc4870e7af4acadb892f61;p=thirdparty%2Fkernel%2Flinux.git ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS commit 5fb86e5d4 (ARM: mx31_3ds: Add sound support) added audio support for mx31pdk, but touched MACH_MX25_3DS Kconfig by mistake. Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS configuration. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer --- diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 0021f726b1532..048ec35e298a1 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/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