diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 00:15:53 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 00:15:53 +0000 |
commit | 155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511 (patch) | |
tree | 4022b9f2dcd33cd567afd88c37d5796d4e61df66 /arch/arm/mach-s5p64x0/Makefile | |
parent | 8a44930a11de8d66f92145fd2d2464ab4fba696b (diff) | |
parent | 74ac23a3e4962bf4f935a5579ae08754d21f9d5a (diff) |
Merge branch 'next-samsung-devel-mmc-spi5' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/driver
Diffstat (limited to 'arch/arm/mach-s5p64x0/Makefile')
-rw-r--r-- | arch/arm/mach-s5p64x0/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p64x0/Makefile b/arch/arm/mach-s5p64x0/Makefile index a7d7a499d99..b44cc044b3c 100644 --- a/arch/arm/mach-s5p64x0/Makefile +++ b/arch/arm/mach-s5p64x0/Makefile @@ -30,3 +30,4 @@ obj-y += dev-audio.o obj-$(CONFIG_S5P64X0_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S5P64X0_SETUP_FB_24BPP) += setup-fb-24bpp.o obj-$(CONFIG_S5P64X0_SETUP_SPI) += setup-spi.o +obj-$(CONFIG_S5P64X0_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o |