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 7fca043ce723a77698d1946e1f88947c9a1d5008..1c2e7fc928e38f8217b9432aa7074909f77ca98a 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_SPI_LM70_LLP)            += spi_lm70llp.o
 obj-$(CONFIG_SPI_PXA2XX)               += pxa2xx_spi.o
 obj-$(CONFIG_SPI_OMAP_UWIRE)           += omap_uwire.o
 obj-$(CONFIG_SPI_OMAP24XX)             += omap2_mcspi.o
+obj-$(CONFIG_SPI_ORION)                        += orion_spi.o
 obj-$(CONFIG_SPI_MPC52xx_PSC)          += mpc52xx_psc_spi.o
 obj-$(CONFIG_SPI_MPC83xx)              += spi_mpc83xx.o
 obj-$(CONFIG_SPI_S3C24XX_GPIO)         += spi_s3c24xx_gpio.o
@@ -34,6 +35,12 @@ 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_TSC2101)      += tsc2101.o
+obj-$(CONFIG_SPI_TSC2102)      += tsc2102.o
+obj-$(CONFIG_SPI_TSC210X)      += tsc210x.o
+obj-$(CONFIG_SPI_TSC2301)      += tsc2301.o
+tsc2301-objs                   := tsc2301-core.o
+tsc2301-$(CONFIG_SPI_TSC2301_AUDIO)    += tsc2301-mixer.o
 #      ... add above this line ...
 
 # SPI slave controller drivers (upstream link)