aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-06-17 09:54:55 +0000
committerJonas Gorski <jogo@openwrt.org>2015-06-17 09:54:55 +0000
commit72d1d554f3f6cb6132831a2c716f91f81619339f (patch)
tree4a3f56e2ebf8f1a7727e46823869007241bef383 /target/linux/oxnas
parentb0364064f437100a45a81cbbb636cbf4260ce5ff (diff)
downloadmaster-187ad058-72d1d554f3f6cb6132831a2c716f91f81619339f.tar.gz
master-187ad058-72d1d554f3f6cb6132831a2c716f91f81619339f.tar.bz2
master-187ad058-72d1d554f3f6cb6132831a2c716f91f81619339f.zip
kernel: update 3.18 to 3.18.16
Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16 Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46011 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas')
-rw-r--r--target/linux/oxnas/patches-3.18/999-libata-hacks.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/oxnas/patches-3.18/999-libata-hacks.patch b/target/linux/oxnas/patches-3.18/999-libata-hacks.patch
index 741dddff40..702a336155 100644
--- a/target/linux/oxnas/patches-3.18/999-libata-hacks.patch
+++ b/target/linux/oxnas/patches-3.18/999-libata-hacks.patch
@@ -36,7 +36,7 @@
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
-@@ -891,6 +891,8 @@ struct ata_port_operations {
+@@ -900,6 +900,8 @@ struct ata_port_operations {
void (*qc_prep)(struct ata_queued_cmd *qc);
unsigned int (*qc_issue)(struct ata_queued_cmd *qc);
bool (*qc_fill_rtf)(struct ata_queued_cmd *qc);
@@ -45,7 +45,7 @@
/*
* Configuration and exception handling
-@@ -981,6 +983,9 @@ struct ata_port_operations {
+@@ -990,6 +992,9 @@ struct ata_port_operations {
void (*phy_reset)(struct ata_port *ap);
void (*eng_timeout)(struct ata_port *ap);