diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:48:52 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:48:52 -0400 |
| commit | 2f2613b028ed57cc17a5320ca88e608b218dd334 (patch) | |
| tree | 4de6526b8d918da24ea227612c3b8bfe9836528b /drivers/spi/Makefile | |
| parent | 96b1a28d65bfc942d84fb612b7f33279390b8ba4 (diff) | |
| parent | 349ad66c0ab0b387afd49e840dbf753ef54cc5d4 (diff) | |
Merge remote-tracking branch 'spi/topic/dspi' into spi-next
Diffstat (limited to 'drivers/spi/Makefile')
| -rw-r--r-- | drivers/spi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 7c4170263cd8..aaacc93c40f4 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile | |||
| @@ -31,6 +31,7 @@ spi-dw-midpci-objs := spi-dw-pci.o spi-dw-mid.o | |||
| 31 | obj-$(CONFIG_SPI_EP93XX) += spi-ep93xx.o | 31 | obj-$(CONFIG_SPI_EP93XX) += spi-ep93xx.o |
| 32 | obj-$(CONFIG_SPI_FALCON) += spi-falcon.o | 32 | obj-$(CONFIG_SPI_FALCON) += spi-falcon.o |
| 33 | obj-$(CONFIG_SPI_FSL_CPM) += spi-fsl-cpm.o | 33 | obj-$(CONFIG_SPI_FSL_CPM) += spi-fsl-cpm.o |
| 34 | obj-$(CONFIG_SPI_FSL_DSPI) += spi-fsl-dspi.o | ||
| 34 | obj-$(CONFIG_SPI_FSL_LIB) += spi-fsl-lib.o | 35 | obj-$(CONFIG_SPI_FSL_LIB) += spi-fsl-lib.o |
| 35 | obj-$(CONFIG_SPI_FSL_ESPI) += spi-fsl-espi.o | 36 | obj-$(CONFIG_SPI_FSL_ESPI) += spi-fsl-espi.o |
| 36 | obj-$(CONFIG_SPI_FSL_SPI) += spi-fsl-spi.o | 37 | obj-$(CONFIG_SPI_FSL_SPI) += spi-fsl-spi.o |