Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / arch / arm / mach-at91 / Kconfig.non_dt

diff --git a/arch/arm/mach-at91/Kconfig.non_dt b/arch/arm/mach-at91/Kconfig.non_dt
index 1f73e9b527dac56f57ca37ec7af80f47b05c37fe..44ace320d2e107ee27a755d82f339996dae81c17 100644 (file)
--- a/arch/arm/mach-at91/Kconfig.non_dt
+++ b/arch/arm/mach-at91/Kconfig.non_dt
@@ -5,6 +5,7 @@ config HAVE_AT91_DATAFLASH_CARD
 
 choice
        prompt "Atmel AT91 Processor Devices for non DT boards"
+       depends on !ARCH_AT91X40
 
 config ARCH_AT91_NONE
        bool "None"
@@ -39,13 +40,6 @@ config ARCH_AT91SAM9G45
        select SOC_AT91SAM9G45
        select AT91_USE_OLD_CLK
 
-config ARCH_AT91X40
-       bool "AT91x40"
-       depends on !MMU
-       select ARCH_USES_GETTIMEOFFSET
-       select MULTI_IRQ_HANDLER
-       select SPARSE_IRQ
-
 endchoice
 
 config ARCH_AT91SAM9G20