diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2015-08-09 11:09:52 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-08-09 11:09:52 +0000 |
| commit | 331f540f34a56959b281f771c46d3facdba62fd8 (patch) | |
| tree | 8b264e34c1cf5ba16cd97639589ff53bcafa73c2 /target/linux/generic/patches-3.18/834-ledtrig-libata.patch | |
| parent | 9986f4096fbb64c7ecefabb08ce87a6ea820675f (diff) | |
| download | master-187ad058-331f540f34a56959b281f771c46d3facdba62fd8.tar.gz master-187ad058-331f540f34a56959b281f771c46d3facdba62fd8.tar.bz2 master-187ad058-331f540f34a56959b281f771c46d3facdba62fd8.zip | |
kernel: update 3.18 to 3.18.20
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.20
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46570 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 7d234eaed0..1360ce9fb8 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 -@@ -4756,6 +4769,9 @@ static struct ata_queued_cmd *ata_qc_new +@@ -4761,6 +4774,9 @@ static struct ata_queued_cmd *ata_qc_new break; } } @@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> return qc; } -@@ -5666,6 +5682,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -5671,6 +5687,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; -@@ -5687,6 +5706,12 @@ static void ata_host_release(struct devi +@@ -5692,6 +5711,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; } -@@ -6133,7 +6158,23 @@ int ata_host_register(struct ata_host *h +@@ -6138,7 +6163,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 -@@ -871,6 +874,12 @@ struct ata_port { +@@ -872,6 +875,12 @@ struct ata_port { #ifdef CONFIG_ATA_ACPI struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */ #endif |