diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 14:22:15 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 14:22:15 +0200 |
| commit | bff7b55bdb325f62c4e30a97883ebd2b536bd47b (patch) | |
| tree | de4ab64ec0837ae308e17312b553e9a5209b6f62 /drivers/spi/Kconfig | |
| parent | clocksource: Drop unused irqaction.mask from SH drivers. (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
| download | linux-bff7b55bdb325f62c4e30a97883ebd2b536bd47b.tar.xz linux-bff7b55bdb325f62c4e30a97883ebd2b536bd47b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/spi/Kconfig')
| -rw-r--r-- | drivers/spi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 83a185d52961..957494775413 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -212,7 +212,7 @@ config SPI_TXX9 config SPI_XILINX tristate "Xilinx SPI controller" - depends on XILINX_VIRTEX && EXPERIMENTAL + depends on (XILINX_VIRTEX || MICROBLAZE) && EXPERIMENTAL select SPI_BITBANG help This exposes the SPI controller IP from the Xilinx EDK. |