diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 11:59:13 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 11:59:13 +0100 |
| commit | 923bd829759171a3ae299c98ca8a0b1cf1ade9f2 (patch) | |
| tree | 744d21883fac44f739968bb222b7d42c57a95ddd /drivers/spi/Makefile | |
| parent | 1d7b293daecc09ec904bc4fc43db8ce7e57250c8 (diff) | |
| parent | f18c7ad48a191f2ecd7262e4f079b77f066b0a95 (diff) | |
Merge branch 'audio' into linux-stable-ux500-3.1
Conflicts:
drivers/misc/Makefile
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 61c3261c388..56f8e794cfb 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -58,4 +58,5 @@ obj-$(CONFIG_SPI_TLE62X0) += spi-tle62x0.o obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi-topcliff-pch.o obj-$(CONFIG_SPI_TXX9) += spi-txx9.o obj-$(CONFIG_SPI_XILINX) += spi-xilinx.o +obj-$(CONFIG_STM_MSP_SPI) += stm_msp.o |