aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-4.0/500-oxnas-sata.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-06-19 11:12:43 +0000
committerJonas Gorski <jogo@openwrt.org>2015-06-19 11:12:43 +0000
commit0f5b1a3ecae01bd64378b898246e006e22c9b539 (patch)
treefff9b91aaed0bc78fb8082de5b431cb9bc977cd5 /target/linux/oxnas/patches-4.0/500-oxnas-sata.patch
parent631e98977b4a4dadde7671f3a35bf3f3a10d11dc (diff)
downloadupstream-0f5b1a3ecae01bd64378b898246e006e22c9b539.tar.gz
upstream-0f5b1a3ecae01bd64378b898246e006e22c9b539.tar.bz2
upstream-0f5b1a3ecae01bd64378b898246e006e22c9b539.zip
kernel: update 4.0 to 4.0.5
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.5 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46063
Diffstat (limited to 'target/linux/oxnas/patches-4.0/500-oxnas-sata.patch')
-rw-r--r--target/linux/oxnas/patches-4.0/500-oxnas-sata.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/oxnas/patches-4.0/500-oxnas-sata.patch b/target/linux/oxnas/patches-4.0/500-oxnas-sata.patch
index c9b11e99d8..af5e66ff03 100644
--- a/target/linux/oxnas/patches-4.0/500-oxnas-sata.patch
+++ b/target/linux/oxnas/patches-4.0/500-oxnas-sata.patch
@@ -1,7 +1,5 @@
-Index: linux-4.0-rc4/drivers/ata/Kconfig
-===================================================================
---- linux-4.0-rc4.orig/drivers/ata/Kconfig
-+++ linux-4.0-rc4/drivers/ata/Kconfig
+--- 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-4.0-rc4/drivers/ata/Kconfig
comment "PATA SFF controllers with BMDMA"
config PATA_ALI
-Index: linux-4.0-rc4/drivers/ata/Makefile
-===================================================================
---- linux-4.0-rc4.orig/drivers/ata/Makefile
-+++ linux-4.0-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