diff options
author | Luka Perkov <luka@openwrt.org> | 2015-02-08 12:01:37 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2015-02-08 12:01:37 +0000 |
commit | 5fb250390c94182ca58cd8b745821af013748f31 (patch) | |
tree | cef86161f3687d71c522125b139e9773d5700149 /target/linux/generic/patches-3.18/834-ledtrig-libata.patch | |
parent | 67ab756ccef6b7d0f1c398a1c4446487453e2e76 (diff) | |
download | upstream-5fb250390c94182ca58cd8b745821af013748f31.tar.gz upstream-5fb250390c94182ca58cd8b745821af013748f31.tar.bz2 upstream-5fb250390c94182ca58cd8b745821af013748f31.zip |
kernel: update 3.18 to 3.18.6
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44318 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/834-ledtrig-libata.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/834-ledtrig-libata.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.18/834-ledtrig-libata.patch b/target/linux/generic/patches-3.18/834-ledtrig-libata.patch index cfe92d9a02..52dab409d7 100644 --- a/target/linux/generic/patches-3.18/834-ledtrig-libata.patch +++ b/target/linux/generic/patches-3.18/834-ledtrig-libata.patch @@ -69,7 +69,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @tf: Target ATA taskfile -@@ -4753,6 +4766,9 @@ static struct ata_queued_cmd *ata_qc_new +@@ -4756,6 +4769,9 @@ static struct ata_queued_cmd *ata_qc_new break; } } @@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> return qc; } -@@ -5663,6 +5679,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -5666,6 +5682,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -89,7 +89,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> ata_sff_port_init(ap); return ap; -@@ -5684,6 +5703,12 @@ static void ata_host_release(struct devi +@@ -5687,6 +5706,12 @@ static void ata_host_release(struct devi kfree(ap->pmp_link); kfree(ap->slave_link); @@ -102,7 +102,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> kfree(ap); host->ports[i] = NULL; } -@@ -6130,7 +6155,23 @@ int ata_host_register(struct ata_host *h +@@ -6133,7 +6158,23 @@ int ata_host_register(struct ata_host *h host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } @@ -138,7 +138,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> /* * Define if arch has non-standard setup. This is a _PCI_ standard -@@ -861,6 +864,12 @@ struct ata_port { +@@ -862,6 +865,12 @@ struct ata_port { #ifdef CONFIG_ATA_ACPI struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */ #endif |