Merge branch 'next/spring-cleaning' into next/cleanup

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"