kernel: update 4.0 to 4.0.5

[openwrt/staging/yousong.git] / target / linux / oxnas / patches-4.0 / 400-oxnas-nand.patch

diff --git a/target/linux/oxnas/patches-4.0/400-oxnas-nand.patch b/target/linux/oxnas/patches-4.0/400-oxnas-nand.patch
index 555b715501aa90753438d6899036b5f8e9c3569e..c59da359ba4741cc0ac23d17d22d05159e1662a8 100644 (file)
--- a/target/linux/oxnas/patches-4.0/400-oxnas-nand.patch
+++ b/target/linux/oxnas/patches-4.0/400-oxnas-nand.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/drivers/mtd/nand/Kconfig
-===================================================================
---- linux-4.0-rc4.orig/drivers/mtd/nand/Kconfig
-+++ linux-4.0-rc4/drivers/mtd/nand/Kconfig
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
 @@ -530,4 +530,12 @@ config MTD_NAND_HISI504
        help
          Enables support for NAND controller on Hisilicon SoC Hip04.
@@ -15,10 +13,8 @@ Index: linux-4.0-rc4/drivers/mtd/nand/Kconfig
 +        to the STATIC Unit.
 +
  endif # MTD_NAND
-Index: linux-4.0-rc4/drivers/mtd/nand/Makefile
-===================================================================
---- linux-4.0-rc4.orig/drivers/mtd/nand/Makefile
-+++ linux-4.0-rc4/drivers/mtd/nand/Makefile
+--- a/drivers/mtd/nand/Makefile
++++ b/drivers/mtd/nand/Makefile
 @@ -45,6 +45,7 @@ obj-$(CONFIG_MTD_NAND_SOCRATES)              += socr
  obj-$(CONFIG_MTD_NAND_TXX9NDFMC)      += txx9ndfmc.o
  obj-$(CONFIG_MTD_NAND_NUC900)         += nuc900_nand.o