diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 19:18:46 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 19:18:46 +0400 |
| commit | dc9c220304c882f06aaadf427821c6388782aab8 (patch) | |
| tree | 85aa7974e312a09bd3cc0b0bcca79091c0cce17a /arch/arm/Kconfig | |
| parent | 5ed3ebe3be1aa2afef203c40f11e732f0f343fb9 (diff) | |
| parent | e7b64391baff6969adeb7b0152c0317a9398fdda (diff) | |
| download | linux-dc9c220304c882f06aaadf427821c6388782aab8.tar.xz | |
Merge branch 'next/spring-cleaning' into next/cleanup
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5c762383b08b..f0a579e8c16c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -410,6 +410,7 @@ config ARCH_GEMINI bool "Cortina Systems Gemini" select ARCH_REQUIRE_GPIOLIB select ARCH_USES_GETTIMEOFFSET + select NEED_MACH_GPIO_H select CPU_FA526 help Support for the Cortina Systems Gemini family SoCs @@ -494,14 +495,6 @@ config ARCH_NETX help This enables support for systems based on the Hilscher NetX Soc -config ARCH_H720X - bool "Hynix HMS720x-based" - select ARCH_USES_GETTIMEOFFSET - select CPU_ARM720T - select ISA_DMA_API - help - This enables support for systems based on the Hynix HMS720x - config ARCH_IOP13XX bool "IOP13xx-based" depends on MMU @@ -1053,8 +1046,6 @@ source "arch/arm/mach-footbridge/Kconfig" source "arch/arm/mach-gemini/Kconfig" -source "arch/arm/mach-h720x/Kconfig" - source "arch/arm/mach-highbank/Kconfig" source "arch/arm/mach-integrator/Kconfig" |