diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
| commit | 9528454f9c02fb9c359c4c42c69eed4d47407e39 (patch) | |
| tree | 40e8c7f829b528073d2b216c3b8e6be205c76245 /drivers/spi/Makefile | |
| parent | 777e1d4a0f3387933f668e7adc81384827975189 (diff) | |
| parent | 1faadface9c5d000bb16e42c89f24859337cf2db (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/spi/Makefile')
| -rw-r--r-- | drivers/spi/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 1bca5f95de25..8f4cb67997b3 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile | |||
| @@ -14,6 +14,9 @@ obj-$(CONFIG_SPI_MASTER) += spi.o | |||
| 14 | obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o | 14 | obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o |
| 15 | obj-$(CONFIG_SPI_BUTTERFLY) += spi_butterfly.o | 15 | obj-$(CONFIG_SPI_BUTTERFLY) += spi_butterfly.o |
| 16 | obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o | 16 | obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o |
| 17 | obj-$(CONFIG_SPI_MPC83xx) += spi_mpc83xx.o | ||
| 18 | obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o | ||
| 19 | obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx.o | ||
| 17 | # ... add above this line ... | 20 | # ... add above this line ... |
| 18 | 21 | ||
| 19 | # SPI protocol drivers (device/link on bus) | 22 | # SPI protocol drivers (device/link on bus) |