diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-29 03:05:14 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-29 03:05:50 -0500 |
| commit | 94a544a4e8d05a027613443c529c399c39cc3371 (patch) | |
| tree | edada38e93a958a918b5826eaef173b1b92079d1 /drivers/spi/Makefile | |
| parent | 496a2e360a34e1f41c336d23947f800216cb9bdf (diff) | |
| parent | 21486af0f34d03b813b023d7a2b887b329f60486 (diff) | |
Merge branch 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next
* 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next
spi/pxa2xx: register driver properly
spi/pxa2xx: add support for shared IRQ handler
spi/pxa2xx: Use define for SSSR_TFL_MASK instead of plain numbers
arm/pxa2xx: reorgazine SSP and SPI header files
spi/pxa2xx: Add CE4100 support
spi/pxa2xx: Consider CE4100's FIFO depth
spi/pxa2xx: Add chipselect support for Sodaville
spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
spi/pxa2xx: pass of_node to spi device and set a parent device
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 7ec375b6c0c3..3a42463c92a4 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile | |||
| @@ -25,6 +25,7 @@ obj-$(CONFIG_SPI_GPIO) += spi_gpio.o | |||
| 25 | obj-$(CONFIG_SPI_IMX) += spi_imx.o | 25 | obj-$(CONFIG_SPI_IMX) += spi_imx.o |
| 26 | obj-$(CONFIG_SPI_LM70_LLP) += spi_lm70llp.o | 26 | obj-$(CONFIG_SPI_LM70_LLP) += spi_lm70llp.o |
| 27 | obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o | 27 | obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o |
| 28 | obj-$(CONFIG_SPI_PXA2XX_PCI) += pxa2xx_spi_pci.o | ||
| 28 | obj-$(CONFIG_SPI_OMAP_UWIRE) += omap_uwire.o | 29 | obj-$(CONFIG_SPI_OMAP_UWIRE) += omap_uwire.o |
| 29 | obj-$(CONFIG_SPI_OMAP24XX) += omap2_mcspi.o | 30 | obj-$(CONFIG_SPI_OMAP24XX) += omap2_mcspi.o |
| 30 | obj-$(CONFIG_SPI_OMAP_100K) += omap_spi_100k.o | 31 | obj-$(CONFIG_SPI_OMAP_100K) += omap_spi_100k.o |