diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-11-10 22:51:30 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-11-10 22:51:30 +0000 |
| commit | a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b (patch) | |
| tree | f5a849fbbd0c2bb9bc9ba75b80f9ff679a707b09 /target/linux/bcm53xx/patches-3.18/405-mtd-bcm53xxspiflash-try-using-JEDEC-as-one-of-method.patch | |
| parent | c5b5e68879238d195e7a797ca82c8e0043e797ee (diff) | |
| download | upstream-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.tar.gz upstream-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.tar.bz2 upstream-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.zip | |
kernel: update kernel 3.18 to rc4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 43229
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/405-mtd-bcm53xxspiflash-try-using-JEDEC-as-one-of-method.patch')
| -rw-r--r-- | target/linux/bcm53xx/patches-3.18/405-mtd-bcm53xxspiflash-try-using-JEDEC-as-one-of-method.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/405-mtd-bcm53xxspiflash-try-using-JEDEC-as-one-of-method.patch b/target/linux/bcm53xx/patches-3.18/405-mtd-bcm53xxspiflash-try-using-JEDEC-as-one-of-method.patch index 04d0058d75..d97441f586 100644 --- a/target/linux/bcm53xx/patches-3.18/405-mtd-bcm53xxspiflash-try-using-JEDEC-as-one-of-method.patch +++ b/target/linux/bcm53xx/patches-3.18/405-mtd-bcm53xxspiflash-try-using-JEDEC-as-one-of-method.patch @@ -9,19 +9,19 @@ + return spi_nor_read_id(nor); found_name: - id = spi_nor_match_id(name); + // id = spi_nor_match_id(name); --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -630,7 +630,7 @@ const struct spi_device_id spi_nor_ids[] +@@ -631,7 +631,7 @@ static const struct spi_device_id spi_no + { }, }; - EXPORT_SYMBOL_GPL(spi_nor_ids); -static const struct spi_device_id *spi_nor_read_id(struct spi_nor *nor) +const struct spi_device_id *spi_nor_read_id(struct spi_nor *nor) { int tmp; u8 id[5]; -@@ -661,6 +661,7 @@ static const struct spi_device_id *spi_n +@@ -662,6 +662,7 @@ static const struct spi_device_id *spi_n dev_err(nor->dev, "unrecognized JEDEC id %06x\n", jedec); return ERR_PTR(-ENODEV); } |