summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam2012-07-03 18:22:16 +0200
committerSascha Hauer2012-07-05 20:55:14 +0200
commit4e28f3a0e43f4b2c99dc4870e7af4acadb892f61 (patch)
treebfc483581d8b60a455d6233aa474a28a20b23756
parentARM: imx27/dt: make dt_compat entry const (diff)
downloadkernel-qcow2-linux-4e28f3a0e43f4b2c99dc4870e7af4acadb892f61.tar.gz
kernel-qcow2-linux-4e28f3a0e43f4b2c99dc4870e7af4acadb892f61.tar.xz
kernel-qcow2-linux-4e28f3a0e43f4b2c99dc4870e7af4acadb892f61.zip
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 <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-imx/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 0021f726b153..048ec35e298a 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