aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-09-21 16:03:13 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-09-21 16:03:13 +0100
commit59b69e27ca9f6c6347b1ec07066a9250140cb9e8 (patch)
treed8ea8948c92bdfc7f3bdfc03a7b789243ffbaaa8 /arch/arm/mach-u300/Makefile
parent9c5e8fecc4a86adbf363f5cf344c0ccccdbb8982 (diff)
parentee2b805c8eb6459cf541ef141ff70dae17af59ca (diff)
downloadkernel_samsung_tuna-59b69e27ca9f6c6347b1ec07066a9250140cb9e8.zip
kernel_samsung_tuna-59b69e27ca9f6c6347b1ec07066a9250140cb9e8.tar.gz
kernel_samsung_tuna-59b69e27ca9f6c6347b1ec07066a9250140cb9e8.tar.bz2
Merge branch 'u300' into devel
Diffstat (limited to 'arch/arm/mach-u300/Makefile')
-rw-r--r--arch/arm/mach-u300/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-u300/Makefile b/arch/arm/mach-u300/Makefile
index 24950e0..885b5c0 100644
--- a/arch/arm/mach-u300/Makefile
+++ b/arch/arm/mach-u300/Makefile
@@ -9,3 +9,6 @@ obj- :=
obj-$(CONFIG_ARCH_U300) += u300.o
obj-$(CONFIG_MMC) += mmc.o
+obj-$(CONFIG_SPI_PL022) += spi.o
+obj-$(CONFIG_MACH_U300_SPIDUMMY) += dummyspichip.o
+obj-$(CONFIG_I2C_STU300) += i2c.o