git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-u300
/
Makefile
diff --git
a/arch/arm/mach-u300/Makefile
b/arch/arm/mach-u300/Makefile
index
24950e0
..
885b5c0
100644
(file)
--- 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