Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6

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

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index c2c87e845abf8d71f3742f29fc16b664d2493d09..1bca5f95de251d00c4775a8e3898da2751b29102 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -13,6 +13,7 @@ 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
 #      ... add above this line ...
 
 # SPI protocol drivers (device/link on bus)