summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/Makefile
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2013-05-15 17:19:21 +0200
committerNicolas Ferre <nicolas.ferre@atmel.com>2013-05-17 15:05:08 +0200
commitb3f442b0eedbc20b5ce3f4a96530588d14901199 (patch)
tree0c5da47086f672f31365985dd5502a9b9dfed63b /arch/arm/mach-at91/Makefile
parent5e8b3bc392180c89da15c7d73915517fba7cc140 (diff)
ARM: at91: udpate defconfigs
Merge 9g20 with 9260 and 9g10 with 9261 as those SoCs can run from the same kernel even in non DT world. Fix the sam9261ek to allow 9g10 and sam9261 to compile together. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/Makefile')
-rw-r--r--arch/arm/mach-at91/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 788562dccb4..f4a5f7998bd 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -27,10 +27,8 @@ obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o
obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200_devices.o
obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260_devices.o
obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261_devices.o
-obj-$(CONFIG_ARCH_AT91SAM9G10) += at91sam9261_devices.o
obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263_devices.o
obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl_devices.o
-obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260_devices.o
obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45_devices.o
obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o