Merge omap-drivers

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

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 457f35be3d24bd2642e558a5a3da0a9179cbf24a..41bb1f28be9a5e0b46e2fdf51941a25840192271 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -21,10 +21,18 @@ obj-$(CONFIG_SPI_OMAP24XX)          += omap2_mcspi.o
 obj-$(CONFIG_SPI_MPC83xx)              += spi_mpc83xx.o
 obj-$(CONFIG_SPI_S3C24XX_GPIO)         += spi_s3c24xx_gpio.o
 obj-$(CONFIG_SPI_S3C24XX)              += spi_s3c24xx.o
+obj-$(CONFIG_SPI_OMAP24XX)             += omap2_mcspi.o
+obj-$(CONFIG_SPI_OMAP_UWIRE)           += omap_uwire.o
 #      ... add above this line ...
 
 # SPI protocol drivers (device/link on bus)
+obj-$(CONFIG_TSC2102)                  += tsc2102.o
 obj-$(CONFIG_SPI_AT25)         += at25.o
+obj-$(CONFIG_SPI_TSC2301)              += tsc2301.o
+tsc2301-objs                                   := tsc2301-core.o
+tsc2301-$(CONFIG_SPI_TSC2301_TOUCHSCREEN)      += tsc2301-ts.o
+tsc2301-$(CONFIG_SPI_TSC2301_KEYPAD)           += tsc2301-kp.o
+tsc2301-$(CONFIG_SPI_TSC2301_AUDIO)            += tsc2301-mixer.o
 #      ... add above this line ...
 
 # SPI slave controller drivers (upstream link)