diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 11:11:46 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-16 11:11:46 -0500 |
commit | bac2f668864eca45b702ee394bef4c5f3a86658c (patch) | |
tree | 9b82100e2f447ae2b3b20f4a935b8020c885adcf /arch/arm/Kconfig | |
parent | cff9f37a1e7b2565f254b5ab40c3213cc0f823a1 (diff) | |
parent | 632506a21a3b5f0596e89d55cda6b482bec331a3 (diff) |
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX dt updates for 3.8
* tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6:
Add device tree file for the armadeus apf27
ARM i.MX: Add Ka-Ro TX25 devicetree
ARM i.MX25: Add devicetree
ARM i.MX25: Add devicetree support
ARM i.MX25: Add missing clock gates
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 041cf0774776..d33dc606f7ec 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -433,19 +433,6 @@ config ARCH_FOOTBRIDGE | |||
433 | Support for systems based on the DC21285 companion chip | 433 | Support for systems based on the DC21285 companion chip |
434 | ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. | 434 | ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. |
435 | 435 | ||
436 | config ARCH_MXC | ||
437 | bool "Freescale MXC/iMX-based" | ||
438 | select ARCH_REQUIRE_GPIOLIB | ||
439 | select CLKDEV_LOOKUP | ||
440 | select CLKSRC_MMIO | ||
441 | select GENERIC_CLOCKEVENTS | ||
442 | select GENERIC_IRQ_CHIP | ||
443 | select MULTI_IRQ_HANDLER | ||
444 | select SPARSE_IRQ | ||
445 | select USE_OF | ||
446 | help | ||
447 | Support for Freescale MXC/iMX-based family of processors | ||
448 | |||
449 | config ARCH_MXS | 436 | config ARCH_MXS |
450 | bool "Freescale MXS-based" | 437 | bool "Freescale MXS-based" |
451 | select ARCH_REQUIRE_GPIOLIB | 438 | select ARCH_REQUIRE_GPIOLIB |
@@ -1057,7 +1044,7 @@ source "arch/arm/mach-msm/Kconfig" | |||
1057 | 1044 | ||
1058 | source "arch/arm/mach-mv78xx0/Kconfig" | 1045 | source "arch/arm/mach-mv78xx0/Kconfig" |
1059 | 1046 | ||
1060 | source "arch/arm/plat-mxc/Kconfig" | 1047 | source "arch/arm/mach-imx/Kconfig" |
1061 | 1048 | ||
1062 | source "arch/arm/mach-mxs/Kconfig" | 1049 | source "arch/arm/mach-mxs/Kconfig" |
1063 | 1050 | ||