kernel: update 3.18 to 3.18.14

[openwrt/svn-archive/archive.git] / target / linux / oxnas / patches-3.18 / 350-oxnas-reset.patch

diff --git a/target/linux/oxnas/patches-3.18/350-oxnas-reset.patch b/target/linux/oxnas/patches-3.18/350-oxnas-reset.patch
index 5540920414553e701f4dda3ea87a5e695f1346b4..c29423756f663b314aed40d34bb9cf27ccf812c3 100644 (file)
--- a/target/linux/oxnas/patches-3.18/350-oxnas-reset.patch
+++ b/target/linux/oxnas/patches-3.18/350-oxnas-reset.patch
@@ -1,7 +1,5 @@
-Index: linux-3.18-rc4/drivers/reset/Kconfig
-===================================================================
---- linux-3.18-rc4.orig/drivers/reset/Kconfig
-+++ linux-3.18-rc4/drivers/reset/Kconfig
+--- a/drivers/reset/Kconfig
++++ b/drivers/reset/Kconfig
 @@ -12,4 +12,9 @@ menuconfig RESET_CONTROLLER
  
          If unsure, say no.
@@ -12,10 +10,8 @@ Index: linux-3.18-rc4/drivers/reset/Kconfig
 +
  source "drivers/reset/sti/Kconfig"
 +
-Index: linux-3.18-rc4/drivers/reset/Makefile
-===================================================================
---- linux-3.18-rc4.orig/drivers/reset/Makefile
-+++ linux-3.18-rc4/drivers/reset/Makefile
+--- a/drivers/reset/Makefile
++++ b/drivers/reset/Makefile
 @@ -1,4 +1,5 @@
  obj-$(CONFIG_RESET_CONTROLLER) += core.o
 +obj-$(CONFIG_RESET_CONTROLLER_OXNAS) += reset-ox820.o