kernel: update 3.18 to 3.18.14

[openwrt/openwrt.git] / target / linux / oxnas / patches-3.18 / 500-oxnas-sata.patch

diff --git a/target/linux/oxnas/patches-3.18/500-oxnas-sata.patch b/target/linux/oxnas/patches-3.18/500-oxnas-sata.patch
index 94b792b136e932cca2d5f1d46c6a16479ab295ac..af5e66ff03bc2bb2c4be231fff53cfcd7368e6f7 100644 (file)
--- a/target/linux/oxnas/patches-3.18/500-oxnas-sata.patch
+++ b/target/linux/oxnas/patches-3.18/500-oxnas-sata.patch
@@ -1,8 +1,6 @@
-Index: linux-3.18-rc4/drivers/ata/Kconfig
-===================================================================
---- linux-3.18-rc4.orig/drivers/ata/Kconfig
-+++ linux-3.18-rc4/drivers/ata/Kconfig
-@@ -385,6 +385,13 @@ config SATA_VITESSE
+--- a/drivers/ata/Kconfig
++++ b/drivers/ata/Kconfig
+@@ -401,6 +401,13 @@ config SATA_VITESSE
  
          If unsure, say N.
  
@@ -16,10 +14,8 @@ Index: linux-3.18-rc4/drivers/ata/Kconfig
  comment "PATA SFF controllers with BMDMA"
  
  config PATA_ALI
-Index: linux-3.18-rc4/drivers/ata/Makefile
-===================================================================
---- linux-3.18-rc4.orig/drivers/ata/Makefile
-+++ linux-3.18-rc4/drivers/ata/Makefile
+--- a/drivers/ata/Makefile
++++ b/drivers/ata/Makefile
 @@ -37,6 +37,7 @@ obj-$(CONFIG_SATA_SVW)               += sata_svw.o
  obj-$(CONFIG_SATA_ULI)                += sata_uli.o
  obj-$(CONFIG_SATA_VIA)                += sata_via.o