diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 15:57:59 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:02:41 +0200 |
| commit | d93bea007ab3d77b796eb99fb4ff4eeb013e0dfa (patch) | |
| tree | fa4f48cd3b0efc23f2378caa1c8eb28d0ba0a4db /arch/arm/Kconfig | |
| parent | 71f6424023cb9fa381efc7237ca05926b2b1ca9a (diff) | |
| parent | d696e3f6585ddeb7bddbf0783b649fa669459a5c (diff) | |
| download | blackbird-op-linux-d93bea007ab3d77b796eb99fb4ff4eeb013e0dfa.tar.gz blackbird-op-linux-d93bea007ab3d77b796eb99fb4ff4eeb013e0dfa.zip | |
Merge tag 'mxs-multiplatform-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/multiplatform
From Shawn Guo <shawn.guo@linaro.org>:
The mxs multiplatform support for 3.10:
* It enables the multiplatform build for mach-mxs platform.
* tag 'mxs-multiplatform-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: enable multiplatform build
ARM: mxs: rename debug-macro.S for multiplatform build
ARM: mxs: call mxs_pm_init() as a machine_desc hook
Conflicts:
arch/arm/Kconfig.debug
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 74d8d4f66109..65aa5ef17734 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -422,23 +422,6 @@ config ARCH_FOOTBRIDGE Support for systems based on the DC21285 companion chip ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. -config ARCH_MXS - bool "Freescale MXS-based" - select ARCH_REQUIRE_GPIOLIB - select CLKDEV_LOOKUP - select CLKSRC_MMIO - select CLKSRC_OF - select COMMON_CLK - select GENERIC_CLOCKEVENTS - select HAVE_CLK_PREPARE - select MULTI_IRQ_HANDLER - select PINCTRL - select SPARSE_IRQ - select STMP_DEVICE - select USE_OF - help - Support for Freescale MXS-based family of processors - config ARCH_NETX bool "Hilscher NetX based" select ARM_VIC |
