diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2017-09-06 13:36:09 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2017-09-06 13:36:09 +0200 |
| commit | 35eed7cb2cf1c58a225a0140729ba787fbb06c88 (patch) | |
| tree | a906a0e20c1b9f6c9d7ce430e80bb1ae677558eb | |
| parent | 56dfb7001a396ef6c7928adcb890043ff55e9977 (diff) | |
| parent | 1a41aa1376df9e24d0c760df1a6f59765316c457 (diff) | |
| download | talos-obmc-linux-35eed7cb2cf1c58a225a0140729ba787fbb06c88.tar.gz talos-obmc-linux-35eed7cb2cf1c58a225a0140729ba787fbb06c88.zip | |
Merge tag 'spi-falcon-no-board-check' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into 4.14-features
spi: Remove board check from the Falcon driver
MIPS is removing this board check so support a cross tree merge.
| -rw-r--r-- | drivers/spi/spi-falcon.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/spi/spi-falcon.c b/drivers/spi/spi-falcon.c index 286b2c81fc6b..f8638e82e5db 100644 --- a/drivers/spi/spi-falcon.c +++ b/drivers/spi/spi-falcon.c @@ -395,11 +395,6 @@ static int falcon_sflash_probe(struct platform_device *pdev) struct spi_master *master; int ret; - if (ltq_boot_select() != BS_SPI) { - dev_err(&pdev->dev, "invalid bootstrap options\n"); - return -ENODEV; - } - master = spi_alloc_master(&pdev->dev, sizeof(*priv)); if (!master) return -ENOMEM; |
