diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:54:11 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:54:11 +0100 |
| commit | b01bc4c8107f2a003b69a2ca03b925a57c13b28b (patch) | |
| tree | 61cc350679a0380d147ddf71b98a3b85f2442cba /drivers | |
| parent | 9b1d12fff0650706eb3c335d31bd378b5d873cb2 (diff) | |
| parent | ffc25a119565d1a8588da6a27b4f6627ea5022ae (diff) | |
| download | barebox-b01bc4c8107f2a003b69a2ca03b925a57c13b28b.tar.gz barebox-b01bc4c8107f2a003b69a2ca03b925a57c13b28b.tar.xz | |
Merge branch 'for-next/randconfig-1'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/mci/mxs.c | 2 | ||||
| -rw-r--r-- | drivers/spi/Kconfig | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index ac96bc0280..15465fe5ec 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -3,6 +3,7 @@ menu "Firmware Drivers" config FIRMWARE_ALTERA_SERIAL bool "Altera SPI programming" depends on OFDEVICE + depends on GENERIC_GPIO depends on SPI select FIRMWARE help diff --git a/drivers/mci/mxs.c b/drivers/mci/mxs.c index 738bde98ae..d6565ca2f8 100644 --- a/drivers/mci/mxs.c +++ b/drivers/mci/mxs.c @@ -53,10 +53,8 @@ struct mxs_mci_host { void __iomem *regs; struct clk *clk; unsigned clock; /* current clock speed in Hz ("0" if disabled) */ -#ifdef CONFIG_MCI_INFO unsigned f_min; unsigned f_max; -#endif unsigned bus_width:2; /* 0 = 1 bit, 1 = 4 bit, 2 = 8 bit */ }; diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 8a9bbd7917..e4fa6a2d94 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -39,7 +39,7 @@ config DRIVER_SPI_IMX_2_3 config DRIVER_SPI_MXS bool "i.MX (23,28) SPI Master driver" - depends on ARCH_IMX23 || ARCH_IMX28 + depends on ARCH_IMX28 depends on SPI config DRIVER_SPI_MVEBU |