aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.0/834-ledtrig-libata.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-04-07 21:34:38 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-04-07 21:34:38 +0000
commit8100b227a99bcdfac356cdd24166343851f362bc (patch)
tree3ec92dbf96d791548e8b015a0860d746f6a3bd51 /target/linux/generic/patches-4.0/834-ledtrig-libata.patch
parent95f7fb8f494a40fbbc7a3b1f4d6bc8a3efba9b7e (diff)
downloadupstream-8100b227a99bcdfac356cdd24166343851f362bc.tar.gz
upstream-8100b227a99bcdfac356cdd24166343851f362bc.tar.bz2
upstream-8100b227a99bcdfac356cdd24166343851f362bc.zip
generic/4.0: upgrade to 4.0-rc7
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 45305
Diffstat (limited to 'target/linux/generic/patches-4.0/834-ledtrig-libata.patch')
-rw-r--r--target/linux/generic/patches-4.0/834-ledtrig-libata.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-4.0/834-ledtrig-libata.patch b/target/linux/generic/patches-4.0/834-ledtrig-libata.patch
index b59483ec25..a3a606275e 100644
--- a/target/linux/generic/patches-4.0/834-ledtrig-libata.patch
+++ b/target/linux/generic/patches-4.0/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
-@@ -4742,6 +4755,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4753,6 +4766,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
@@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag);
qc->tag = tag;
-@@ -5636,6 +5652,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -5647,6 +5663,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;
-@@ -5657,6 +5676,12 @@ static void ata_host_release(struct devi
+@@ -5668,6 +5687,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;
}
-@@ -6103,7 +6128,23 @@ int ata_host_register(struct ata_host *h
+@@ -6114,7 +6139,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;
}