summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-10-17 15:41:31 +0200
committerNicolas Ferre <nicolas.ferre@atmel.com>2012-10-24 18:08:48 +0200
commit08d04a135a1c2e24c4d4bc7bbafee5e0e58f80c6 (patch)
tree25bf9955e932820da56a812175d278af56e2c83e /arch
parentARM: at91/i2c: change id to let i2c-at91 work (diff)
downloadlinux-08d04a135a1c2e24c4d4bc7bbafee5e0e58f80c6.tar.xz
linux-08d04a135a1c2e24c4d4bc7bbafee5e0e58f80c6.zip
ARM: at91: drop duplicated config SOC_AT91SAM9 entry
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-at91/Kconfig10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index b14207101938..043624219b55 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -21,19 +21,13 @@ config SOC_AT91SAM9
bool
select CPU_ARM926T
select GENERIC_CLOCKEVENTS
+ select MULTI_IRQ_HANDLER
+ select SPARSE_IRQ
menu "Atmel AT91 System-on-Chip"
comment "Atmel AT91 Processor"
-config SOC_AT91SAM9
- bool
- select AT91_SAM9_SMC
- select AT91_SAM9_TIME
- select CPU_ARM926T
- select MULTI_IRQ_HANDLER
- select SPARSE_IRQ
-
config SOC_AT91RM9200
bool "AT91RM9200"
select CPU_ARM920T