Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6] / drivers / spi / Makefile

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 5da6a4df40129b1cf2968babb080009bcaf169ba..8f4cb67997b32afcc5207b49fb7ae2dfcb2654eb 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -12,6 +12,11 @@ obj-$(CONFIG_SPI_MASTER)             += spi.o
 
 # SPI master controller drivers (bus)
 obj-$(CONFIG_SPI_BITBANG)              += spi_bitbang.o
+obj-$(CONFIG_SPI_BUTTERFLY)            += spi_butterfly.o
+obj-$(CONFIG_SPI_PXA2XX)               += pxa2xx_spi.o
+obj-$(CONFIG_SPI_MPC83xx)              += spi_mpc83xx.o
+obj-$(CONFIG_SPI_S3C24XX_GPIO)         += spi_s3c24xx_gpio.o
+obj-$(CONFIG_SPI_S3C24XX)              += spi_s3c24xx.o
 #      ... add above this line ...
 
 # SPI protocol drivers (device/link on bus)