Merge branch 'for-arm-soc' of git://git.armlinux.org.uk/~rmk/linux-arm into arm/soc

[linux-2.6-block.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fe31c97c74eaabe82fabeb018ec6f2e867bf96ae..1d50861ef241dcab97855b17f29447b79c1d2475 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -374,15 +374,6 @@ config ARCH_FOOTBRIDGE
          Support for systems based on the DC21285 companion chip
          ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
 
-config ARCH_NETX
-       bool "Hilscher NetX based"
-       select ARM_VIC
-       select CLKSRC_MMIO
-       select CPU_ARM926T
-       select GENERIC_CLOCKEVENTS
-       help
-         This enables support for systems based on the Hilscher NetX Soc
-
 config ARCH_IOP13XX
        bool "IOP13xx-based"
        depends on MMU
@@ -768,8 +759,6 @@ source "arch/arm/mach-mvebu/Kconfig"
 
 source "arch/arm/mach-mxs/Kconfig"
 
-source "arch/arm/mach-netx/Kconfig"
-
 source "arch/arm/mach-nomadik/Kconfig"
 
 source "arch/arm/mach-npcm/Kconfig"