Skip to content

Commit 35eed7c

Browse files
committed
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.
2 parents 56dfb70 + 1a41aa1 commit 35eed7c

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

drivers/spi/spi-falcon.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -395,11 +395,6 @@ static int falcon_sflash_probe(struct platform_device *pdev)
395395
struct spi_master *master;
396396
int ret;
397397

398-
if (ltq_boot_select() != BS_SPI) {
399-
dev_err(&pdev->dev, "invalid bootstrap options\n");
400-
return -ENODEV;
401-
}
402-
403398
master = spi_alloc_master(&pdev->dev, sizeof(*priv));
404399
if (!master)
405400
return -ENOMEM;

0 commit comments

Comments
 (0)