summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv310/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-28 20:39:13 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-28 20:39:13 +0100
commit9bafc74163d8bccca9810159aab39be926fb877c (patch)
treebaa3ba406135247eeb9cdf495448b5db8eea2f0b /arch/arm/mach-s5pv310/Makefile
parent8df6516864462cb7a6f87d5a46df68fb0faebbb5 (diff)
parentb3773301c4290f054aa2aa5379e59a1bf4f78bdf (diff)
downloadlinux-9bafc74163d8bccca9810159aab39be926fb877c.tar.gz
linux-9bafc74163d8bccca9810159aab39be926fb877c.tar.bz2
linux-9bafc74163d8bccca9810159aab39be926fb877c.zip
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-s5pv310/Makefile')
-rw-r--r--arch/arm/mach-s5pv310/Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv310/Makefile b/arch/arm/mach-s5pv310/Makefile
index d5b51c72340f..84afc64e7c01 100644
--- a/arch/arm/mach-s5pv310/Makefile
+++ b/arch/arm/mach-s5pv310/Makefile
@@ -13,7 +13,7 @@ obj- :=
# Core support for S5PV310 system
obj-$(CONFIG_CPU_S5PV310) += cpu.o init.o clock.o irq-combiner.o
-obj-$(CONFIG_CPU_S5PV310) += setup-i2c0.o time.o
+obj-$(CONFIG_CPU_S5PV310) += setup-i2c0.o time.o gpiolib.o irq-eint.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
@@ -21,6 +21,7 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
# machine support
+obj-$(CONFIG_MACH_SMDKC210) += mach-smdkc210.o
obj-$(CONFIG_MACH_SMDKV310) += mach-smdkv310.o
obj-$(CONFIG_MACH_UNIVERSAL_C210) += mach-universal_c210.o
@@ -28,3 +29,10 @@ obj-$(CONFIG_MACH_UNIVERSAL_C210) += mach-universal_c210.o
obj-$(CONFIG_S5PV310_SETUP_I2C1) += setup-i2c1.o
obj-$(CONFIG_S5PV310_SETUP_I2C2) += setup-i2c2.o
+obj-$(CONFIG_S5PV310_SETUP_I2C3) += setup-i2c3.o
+obj-$(CONFIG_S5PV310_SETUP_I2C4) += setup-i2c4.o
+obj-$(CONFIG_S5PV310_SETUP_I2C5) += setup-i2c5.o
+obj-$(CONFIG_S5PV310_SETUP_I2C6) += setup-i2c6.o
+obj-$(CONFIG_S5PV310_SETUP_I2C7) += setup-i2c7.o
+obj-$(CONFIG_S5PV310_SETUP_SDHCI) += setup-sdhci.o
+obj-$(CONFIG_S5PV310_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o