diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 10:22:04 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 10:22:04 +0000 |
| commit | b9c13dc540403877ee43369ce0027f43c7cab928 (patch) | |
| tree | dec25a80e17d7c6d67b6daf822c22f5d10db3dd5 /target/linux/oxnas | |
| parent | 966f1ab30128279f7b07acda088f4f3399718867 (diff) | |
| download | upstream-b9c13dc540403877ee43369ce0027f43c7cab928.tar.gz upstream-b9c13dc540403877ee43369ce0027f43c7cab928.tar.bz2 upstream-b9c13dc540403877ee43369ce0027f43c7cab928.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>
Backport of r46011.
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46015 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas')
| -rw-r--r-- | target/linux/oxnas/patches-3.18/999-libata-hacks.patch | 4 |
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); |