kernel: bump 4.14 to 4.14.99

[openwrt/openwrt.git] / target / linux / layerscape / patches-4.14 / 301-arch-support-layerscape.patch

diff --git a/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch b/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch
index faa02bffa8e768058d4729930f887dafab005783..970e95cf3b2ee9c6cc3524ee251135361f4d565a 100644 (file)
--- a/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/301-arch-support-layerscape.patch
@@ -247,7 +247,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  /*
 --- a/arch/arm64/include/asm/io.h
 +++ b/arch/arm64/include/asm/io.h
-@@ -170,6 +170,7 @@ extern void __iomem *ioremap_cache(phys_
+@@ -186,6 +186,7 @@ extern void __iomem *ioremap_cache(phys_
  #define ioremap_nocache(addr, size)   __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))
  #define ioremap_wc(addr, size)                __ioremap((addr), (size), __pgprot(PROT_NORMAL_NC))
  #define ioremap_wt(addr, size)                __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))