diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-15 23:45:45 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-15 23:45:45 +0100 |
| commit | 8864eaca909d03caa220534640a7c92e4d06c96d (patch) | |
| tree | 75904540dfb565748f5135ee273143f731f40e40 /arch/arm/Kconfig | |
| parent | fb4f0424293a0fb75d0c9edbc16bd618930ff2da (diff) | |
| parent | 84f45ee9d7f08cc0c0f9276573e1bdf53ccdd58b (diff) | |
| download | linux-8864eaca909d03caa220534640a7c92e4d06c96d.tar.bz2 | |
Merge branch 'mmp/multiplatform' into next/multiplatform
* mmp/multiplatform:
ARM: mmp: avoid unused functions
ARM: mmp: move into ARCH_MULTIPLATFORM
ARM: mmp: make all header files local
ARM: mmp: make plat-pxa build standalone
ARM: mmp: remove remaining legacy pxa-dma support
ARM: mohawk: allow building with MMU disabled
ARM: make xscale iwmmxt code multiplatform aware
clk: mmp: stop using platform headers
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 97adb5eda7bb..3ec80545c6ed 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -546,22 +546,6 @@ config ARCH_ORION5X Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), Orion-2 (5281), Orion-1-90 (6183). -config ARCH_MMP - bool "Marvell PXA168/910/MMP2" - depends on MMU - select ARCH_REQUIRE_GPIOLIB - select CLKDEV_LOOKUP - select GENERIC_ALLOCATOR - select GENERIC_CLOCKEVENTS - select GPIO_PXA - select IRQ_DOMAIN - select MULTI_IRQ_HANDLER - select PINCTRL - select PLAT_PXA - select SPARSE_IRQ - help - Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. - config ARCH_KS8695 bool "Micrel/Kendin KS8695" select ARCH_REQUIRE_GPIOLIB |