Skip to content

Commit

Permalink
Merge tag 'spi-falcon-no-board-check' of git://git.kernel.org/pub/scm…
Browse files Browse the repository at this point in the history
…/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.
  • Loading branch information
ralfbaechle committed Sep 6, 2017
2 parents 56dfb70 + 1a41aa1 commit 35eed7c
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions drivers/spi/spi-falcon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 35eed7c

Please sign in to comment.