diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-18 17:51:44 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-18 17:51:44 +0200 |
| commit | 0bf6b1da1a53e8414d954251b1d13e2cdbd499b4 (patch) | |
| tree | 8e353cf014dea8bb9bd0e13c3f8c06dc6f3f8c07 /arch/arm/Kconfig | |
| parent | af496a67c101b2161a12c1bc70626f6a479501bb (diff) | |
| parent | c8b7d43b6d539218c36f0ac8a6ad434b93195703 (diff) | |
Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into for-next
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 7bb4735033c..9fb82e0a662 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -504,14 +504,6 @@ config ARCH_KIRKWOOD Support for the following Marvell Kirkwood series SoCs: 88F6180, 88F6192 and 88F6281. -config ARCH_LOKI - bool "Marvell Loki (88RC8480)" - select CPU_FEROCEON - select GENERIC_CLOCKEVENTS - select PLAT_ORION - help - Support for the Marvell Loki (88RC8480) SoC. - config ARCH_LPC32XX bool "NXP LPC32XX" select CLKSRC_MMIO @@ -953,8 +945,6 @@ source "arch/arm/mach-kirkwood/Kconfig" source "arch/arm/mach-ks8695/Kconfig" -source "arch/arm/mach-loki/Kconfig" - source "arch/arm/mach-lpc32xx/Kconfig" source "arch/arm/mach-msm/Kconfig" @@ -998,7 +988,6 @@ source "arch/arm/plat-spear/Kconfig" source "arch/arm/plat-tcc/Kconfig" if ARCH_S3C2410 -source "arch/arm/mach-s3c2400/Kconfig" source "arch/arm/mach-s3c2410/Kconfig" source "arch/arm/mach-s3c2412/Kconfig" source "arch/arm/mach-s3c2416/Kconfig" |