Merge omap-drivers

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

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 83b3e70365f39ee0e9cfa306885089a48382f795..b0cc059345329bc82ab94a93de719935ce711480 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -12,8 +12,11 @@ obj-$(CONFIG_SPI_MASTER)             += spi.o
 
 # SPI master controller drivers (bus)
 obj-$(CONFIG_SPI_BITBANG)              += spi_bitbang.o
+obj-$(CONFIG_SPI_ATMEL)                        += atmel_spi.o
 obj-$(CONFIG_SPI_BUTTERFLY)            += spi_butterfly.o
+obj-$(CONFIG_SPI_IMX)                  += spi_imx.o
 obj-$(CONFIG_SPI_PXA2XX)               += pxa2xx_spi.o
+obj-$(CONFIG_SPI_OMAP_UWIRE)           += omap_uwire.o
 obj-$(CONFIG_SPI_MPC83xx)              += spi_mpc83xx.o
 obj-$(CONFIG_SPI_S3C24XX_GPIO)         += spi_s3c24xx_gpio.o
 obj-$(CONFIG_SPI_S3C24XX)              += spi_s3c24xx.o
@@ -23,6 +26,7 @@ obj-$(CONFIG_SPI_OMAP_UWIRE)          += omap_uwire.o
 
 # SPI protocol drivers (device/link on bus)
 obj-$(CONFIG_TSC2102)                  += tsc2102.o
+obj-$(CONFIG_SPI_AT25)         += at25.o
 #      ... add above this line ...
 
 # SPI slave controller drivers (upstream link)