diff options
author | Mark Brown <broonie@kernel.org> | 2015-04-08 21:04:25 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-08 21:04:25 +0100 |
commit | 89cda06d7f9c3c111a81fcdf5464926f5f984ebc (patch) | |
tree | bfa46c20c325feccd9de1a293e11686981d63e7b /drivers/spi/spi-dw-pci.c | |
parent | ede8342bf63166e8d8fc3c05fc0985b27cc8186b (diff) | |
parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
download | lwn-89cda06d7f9c3c111a81fcdf5464926f5f984ebc.tar.gz lwn-89cda06d7f9c3c111a81fcdf5464926f5f984ebc.zip |
Merge tag 'v4.0-rc7' into spi-img-spfi
Linux 4.0-rc7
Diffstat (limited to 'drivers/spi/spi-dw-pci.c')
-rw-r--r-- | drivers/spi/spi-dw-pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c index 5ba331047cbe..6d331e0db331 100644 --- a/drivers/spi/spi-dw-pci.c +++ b/drivers/spi/spi-dw-pci.c @@ -36,13 +36,13 @@ struct spi_pci_desc { static struct spi_pci_desc spi_pci_mid_desc_1 = { .setup = dw_spi_mid_init, - .num_cs = 32, + .num_cs = 5, .bus_num = 0, }; static struct spi_pci_desc spi_pci_mid_desc_2 = { .setup = dw_spi_mid_init, - .num_cs = 4, + .num_cs = 2, .bus_num = 1, }; |