Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / spi / Makefile

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 5e9f521b8844b9b23e25f1dcb165811a96051954..525abc3dcb9fe9c656192cdc70c0070369ac9c97 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -36,6 +36,9 @@ obj-$(CONFIG_SPI_SH_SCI)              += spi_sh_sci.o
 obj-$(CONFIG_SPI_AT25)         += at25.o
 obj-$(CONFIG_SPI_SPIDEV)       += spidev.o
 obj-$(CONFIG_SPI_TLE62X0)      += tle62x0.o
+obj-$(CONFIG_SPI_TSC210X)      += tsc210x.o
+obj-$(CONFIG_SPI_TSC2301)      += tsc2301.o
+tsc2301-objs                   := tsc2301-core.o
 #      ... add above this line ...
 
 # SPI slave controller drivers (upstream link)