diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 22:29:38 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 22:29:38 +0100 |
| commit | b83e139caf1f7230f274bf9b4706ea3fab550a72 (patch) | |
| tree | 699ab2bba579676ad98315dab93b16de237c0192 /arch/arm/Kconfig | |
| parent | 0203e0f7d73fad87921edc42634f73de6fc630c9 (diff) | |
| parent | 415f59142d9d9dd023deaeb3b4dfc1aecdd3983c (diff) | |
| download | linux-3.10-b83e139caf1f7230f274bf9b4706ea3fab550a72.tar.gz linux-3.10-b83e139caf1f7230f274bf9b4706ea3fab550a72.tar.bz2 linux-3.10-b83e139caf1f7230f274bf9b4706ea3fab550a72.zip | |
Merge branch 'cns3xxx/multiplatform' into next/multiplatform
I've looked at all the platforms recently to see what their
state is. cns3xxx seems quite clean but not very actively
maintained. Since it is really easy to convert to multiplatform,
that's what I did here.
* cns3xxx/multiplatform:
ARM: cns3xxx: initial DT support
ARM: cns3xxx: enable multiplatform support
ARM: cns3xxx: move debug_ll code to include/debug/
ARM: cns3xxx: enable sparse IRQ support
ARM: cns3xxx: make mach header files local
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a5ddc366047..9a95f7897ba 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -382,17 +382,6 @@ config ARCH_BCM2835 This enables support for the Broadcom BCM2835 SoC. This SoC is use in the Raspberry Pi, and Roku 2 devices. -config ARCH_CNS3XXX - bool "Cavium Networks CNS3XXX family" - select ARM_GIC - select CPU_V6K - select GENERIC_CLOCKEVENTS - select MIGHT_HAVE_CACHE_L2X0 - select MIGHT_HAVE_PCI - select PCI_DOMAINS if PCI - help - Support for Cavium Networks CNS3XXX platform. - config ARCH_CLPS711X bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" select ARCH_REQUIRE_GPIOLIB |