From: Linus Torvalds Date: Sat, 14 Jan 2012 21:25:55 +0000 (-0800) Subject: Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git... X-Git-Tag: MMI-PSA29.97-13-9~17636 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=81d48f0aee544885c39ef6e1ffb1175f276e6adf;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6 2nd set of device tree changes and SPI bug fixes for v3.3 * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6: of/irq: Add interrupts-names property to name an irq resource of/address: Add reg-names property to name an iomem resource * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6: spi/tegra: depend instead of select TEGRA_SYSTEM_DMA --- 81d48f0aee544885c39ef6e1ffb1175f276e6adf diff --cc drivers/spi/Kconfig index 561a832417b8,8ba4510a9519,a1c468e25918..3f9a47ec67dc --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@@@ -87,8 -87,8 -87,8 +87,8 @@@@ config SPI_BFIN_SPOR Enable support for a SPI bus via the Blackfin SPORT peripheral. config SPI_AU1550 -- tristate "Au1550/Au12x0 SPI Controller" - depends on (SOC_AU1550 || SOC_AU1200) && EXPERIMENTAL ++ tristate "Au1550/Au1200/Au1300 SPI Controller" + depends on MIPS_ALCHEMY && EXPERIMENTAL select SPI_BITBANG help If you say yes to this option, support will be included for the