Merge branch 'linus' into x86/urgent

[pandora-kernel.git] / arch / arm / mach-at91 / Makefile

diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index a21f08c..7d641f9 100644 (file)
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -8,7 +8,6 @@ obj-n           :=
 obj-           :=
 
 obj-$(CONFIG_AT91_PMC_UNIT)    += clock.o
-obj-$(CONFIG_PM)               += pm.o
 
 # CPU-specific support
 obj-$(CONFIG_ARCH_AT91RM9200)  += at91rm9200.o at91rm9200_time.o at91rm9200_devices.o
@@ -16,6 +15,8 @@ obj-$(CONFIG_ARCH_AT91SAM9260)        += at91sam9260.o at91sam926x_time.o at91sam9260_d
 obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o
 obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o
 obj-$(CONFIG_ARCH_AT91SAM9RL)  += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o
+obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o
+obj-$(CONFIG_ARCH_AT91CAP9)    += at91cap9.o at91sam926x_time.o at91cap9_devices.o
 obj-$(CONFIG_ARCH_AT91X40)     += at91x40.o at91x40_time.o
 
 # AT91RM9200 board-specific support
@@ -29,33 +30,40 @@ obj-$(CONFIG_MACH_KB9200)   += board-kb9202.o
 obj-$(CONFIG_MACH_ATEB9200)    += board-eb9200.o
 obj-$(CONFIG_MACH_KAFA)                += board-kafa.o
 obj-$(CONFIG_MACH_PICOTUX2XX)  += board-picotux200.o
-obj-$(CONFIG_MACH_AT91EB01)    += board-eb01.o
+obj-$(CONFIG_MACH_ECBAT91)     += board-ecbat91.o
+obj-$(CONFIG_MACH_YL9200)      += board-yl-9200.o
 
 # AT91SAM9260 board-specific support
 obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
+obj-$(CONFIG_MACH_CAM60)       += board-cam60.o
+obj-$(CONFIG_MACH_SAM9_L9260)  += board-sam9-l9260.o
+obj-$(CONFIG_MACH_USB_A9260)   += board-usb-a9260.o
+obj-$(CONFIG_MACH_QIL_A9260)   += board-qil-a9260.o
 
 # AT91SAM9261 board-specific support
 obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o
 
 # AT91SAM9263 board-specific support
 obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
+obj-$(CONFIG_MACH_USB_A9263)   += board-usb-a9263.o
 
 # AT91SAM9RL board-specific support
 obj-$(CONFIG_MACH_AT91SAM9RLEK)        += board-sam9rlek.o
 
-# LEDs support
-led-$(CONFIG_ARCH_AT91RM9200DK)        += leds.o
-led-$(CONFIG_MACH_AT91RM9200EK)        += leds.o
-led-$(CONFIG_MACH_AT91SAM9261EK)+= leds.o
-led-$(CONFIG_MACH_CSB337)      += leds.o
-led-$(CONFIG_MACH_CSB637)      += leds.o
-led-$(CONFIG_MACH_KB9200)      += leds.o
-led-$(CONFIG_MACH_KAFA)                += leds.o
-obj-$(CONFIG_LEDS) += $(led-y)
+# AT91SAM9G20 board-specific support
+obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o
+
+# AT91CAP9 board-specific support
+obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o
 
-# VGA support
-#obj-$(CONFIG_FB_S1D13XXX)     += ics1523.o
+# AT91X40 board-specific support
+obj-$(CONFIG_MACH_AT91EB01)    += board-eb01.o
+
+# Drivers
+obj-y                          += leds.o
 
+# Power Management
+obj-$(CONFIG_PM)               += pm.o
 
 ifeq ($(CONFIG_PM_DEBUG),y)
 CFLAGS_pm.o += -DDEBUG