diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 15:28:33 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 15:28:33 -0400 |
| commit | 0508c8e7d47bb64a13cb5d080c4520fe90880b18 (patch) | |
| tree | d9eafb85892d0b2860cff28bc2c06f6c03472204 /arch/arm/mach-imx/Kconfig | |
| parent | a26361a77edc724492558a458af6c19cf821ab87 (diff) | |
| parent | bec31a85f0f83567ed4b77e0cd6399bac2f0f037 (diff) | |
Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX cleanups for v3.6
* tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: imx: remove unused pdata from device macros
ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS
ARM: imx27/dt: make dt_compat entry const
ARM: imx: cleanup otg_mode
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index eff4db5de0dd..0da882a3c063 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
| @@ -158,7 +158,6 @@ config MACH_MX25_3DS | |||
| 158 | select IMX_HAVE_PLATFORM_IMX2_WDT | 158 | select IMX_HAVE_PLATFORM_IMX2_WDT |
| 159 | select IMX_HAVE_PLATFORM_IMXDI_RTC | 159 | select IMX_HAVE_PLATFORM_IMXDI_RTC |
| 160 | select IMX_HAVE_PLATFORM_IMX_I2C | 160 | select IMX_HAVE_PLATFORM_IMX_I2C |
| 161 | select IMX_HAVE_PLATFORM_IMX_SSI | ||
| 162 | select IMX_HAVE_PLATFORM_IMX_FB | 161 | select IMX_HAVE_PLATFORM_IMX_FB |
| 163 | select IMX_HAVE_PLATFORM_IMX_KEYPAD | 162 | select IMX_HAVE_PLATFORM_IMX_KEYPAD |
| 164 | select IMX_HAVE_PLATFORM_IMX_UART | 163 | select IMX_HAVE_PLATFORM_IMX_UART |