aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/Makefile
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2012-07-27 16:45:04 +0200
committerAndrew Lunn <andrew@lunn.ch>2012-07-27 16:45:04 +0200
commit4297103560b4c5aba904e4711e982a039619f1f6 (patch)
tree772c527706c8d7677d79390ac3336af11bcc34e2 /drivers/spi/Makefile
parent84a1caf1453c3d44050bd22db958af4a7f99315c (diff)
parent8ceffa7c4a4c378d8e371fe2f444656e75390b34 (diff)
downloadkernel_goldelico_gta04-4297103560b4c5aba904e4711e982a039619f1f6.zip
kernel_goldelico_gta04-4297103560b4c5aba904e4711e982a039619f1f6.tar.gz
kernel_goldelico_gta04-4297103560b4c5aba904e4711e982a039619f1f6.tar.bz2
Merge tag 'spi-3.6' into v3.5-rc7-dt-v3
spi: Updates for 3.6 Since Grant is even more specacularly busy than usual for the time being I've been collecting SPI patches for him for this release - probably things will revert back to Grant before the next release. There's nothing too exciting here, mostly it's simple driver specific stuff: - Add spi: to the modaliases of SPI devices to provide namespacing. - A driver for AD-FMCOMMS1-EBZ. - DT binding for Orion. - Fixes and cleanups for i.MX, PL0022, OMAP and bitbang drivers. There may be a few more fixes I've missed, people keep sending me new things.
Diffstat (limited to 'drivers/spi/Makefile')
-rw-r--r--drivers/spi/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 9d75d21..273f50d 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -61,5 +61,6 @@ obj-$(CONFIG_SPI_TI_SSP) += spi-ti-ssp.o
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_XCOMM) += spi-xcomm.o
obj-$(CONFIG_SPI_XILINX) += spi-xilinx.o