aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-3.14/500-oxnas-sata.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
commit6e4472e69e89aa56ad8c0e6f90415a2b8da36eba (patch)
treeb35c1688c3303eb7f7dff2304798f8eb320812fb /target/linux/oxnas/patches-3.14/500-oxnas-sata.patch
parenta899dbd4e32835b0a1d917479d10e5a2744c273c (diff)
downloadmaster-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.gz
master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.bz2
master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.zip
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas/patches-3.14/500-oxnas-sata.patch')
-rw-r--r--target/linux/oxnas/patches-3.14/500-oxnas-sata.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/oxnas/patches-3.14/500-oxnas-sata.patch b/target/linux/oxnas/patches-3.14/500-oxnas-sata.patch
index d203734a43..d999ad6c06 100644
--- a/target/linux/oxnas/patches-3.14/500-oxnas-sata.patch
+++ b/target/linux/oxnas/patches-3.14/500-oxnas-sata.patch
@@ -1,7 +1,5 @@
-Index: linux-3.14.18/drivers/ata/Kconfig
-===================================================================
---- linux-3.14.18.orig/drivers/ata/Kconfig
-+++ linux-3.14.18/drivers/ata/Kconfig
+--- a/drivers/ata/Kconfig
++++ b/drivers/ata/Kconfig
@@ -330,6 +330,13 @@ config SATA_VITESSE
If unsure, say N.
@@ -16,10 +14,8 @@ Index: linux-3.14.18/drivers/ata/Kconfig
comment "PATA SFF controllers with BMDMA"
config PATA_ALI
-Index: linux-3.14.18/drivers/ata/Makefile
-===================================================================
---- linux-3.14.18.orig/drivers/ata/Makefile
-+++ linux-3.14.18/drivers/ata/Makefile
+--- a/drivers/ata/Makefile
++++ b/drivers/ata/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_SATA_SVW) += sata_svw.o
obj-$(CONFIG_SATA_ULI) += sata_uli.o
obj-$(CONFIG_SATA_VIA) += sata_via.o