kernel: update bcma backporting changes up to 4.8

[openwrt/staging/chunkeey.git] / target / linux / generic / patches-4.4 / 042-0001-mtd-bcm47xxsflash-use-ioremap_cache-instead-of-KSEG0.patch

diff --git a/target/linux/generic/patches-4.4/042-0001-mtd-bcm47xxsflash-use-ioremap_cache-instead-of-KSEG0.patch b/target/linux/generic/patches-4.4/042-0001-mtd-bcm47xxsflash-use-ioremap_cache-instead-of-KSEG0.patch
index a401e55b447a483a00becf19c3d755a1f716c5db..89f1e5eccfafc03193e10029aee6681db3de7e05 100644 (file)
--- a/target/linux/generic/patches-4.4/042-0001-mtd-bcm47xxsflash-use-ioremap_cache-instead-of-KSEG0.patch
+++ b/target/linux/generic/patches-4.4/042-0001-mtd-bcm47xxsflash-use-ioremap_cache-instead-of-KSEG0.patch
@@ -128,7 +128,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
        u32 size;
 --- a/include/linux/bcma/bcma_driver_chipcommon.h
 +++ b/include/linux/bcma/bcma_driver_chipcommon.h
-@@ -585,7 +585,6 @@ struct bcma_pflash {
+@@ -588,7 +588,6 @@ struct bcma_pflash {
  #ifdef CONFIG_BCMA_SFLASH
  struct bcma_sflash {
        bool present;