Merge branch 'for-3.18/drivers' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / arch / arm / mach-s5pv210 / Makefile

diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 1c4e419..72b9e96 100644 (file)
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -5,38 +5,12 @@
 #
 # Licensed under GPLv2
 
-obj-y                          :=
-obj-m                          :=
-obj-n                          :=
-obj-                           :=
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include
 
 # Core
 
-obj-y                          += common.o clock.o
-
-obj-$(CONFIG_PM)               += pm.o
-
-obj-y                          += dma.o
+obj-$(CONFIG_PM_SLEEP)         += pm.o sleep.o
 
 # machine support
 
-obj-$(CONFIG_MACH_AQUILA)      += mach-aquila.o
-obj-$(CONFIG_MACH_GONI)                += mach-goni.o
-obj-$(CONFIG_MACH_SMDKC110)    += mach-smdkc110.o
-obj-$(CONFIG_MACH_SMDKV210)    += mach-smdkv210.o
-obj-$(CONFIG_MACH_TORBRECK)    += mach-torbreck.o
-
-# device support
-
-obj-y                          += dev-audio.o
-
-obj-y                                  += setup-i2c0.o
-obj-$(CONFIG_S5PV210_SETUP_FB_24BPP)   += setup-fb-24bpp.o
-obj-$(CONFIG_S5PV210_SETUP_FIMC)       += setup-fimc.o
-obj-$(CONFIG_S5PV210_SETUP_I2C1)       += setup-i2c1.o
-obj-$(CONFIG_S5PV210_SETUP_I2C2)       += setup-i2c2.o
-obj-$(CONFIG_S5PV210_SETUP_IDE)                += setup-ide.o
-obj-$(CONFIG_S5PV210_SETUP_KEYPAD)     += setup-keypad.o
-obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
-obj-$(CONFIG_S5PV210_SETUP_SPI)                += setup-spi.o
-obj-$(CONFIG_S5PV210_SETUP_USB_PHY) += setup-usb-phy.o
+obj-y                          += s5pv210.o