projects
/
15.05
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.18 to 3.18.6
[15.05/openwrt.git]
/
target
/
linux
/
generic
/
patches-3.18
/
834-ledtrig-libata.patch
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
cfe92d9
..
52dab40
100644
(file)
--- 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
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
-@@ -475
3,6 +4766
,9 @@ static struct ata_queued_cmd *ata_qc_new
+@@ -475
6,6 +4769
,9 @@ static struct ata_queued_cmd *ata_qc_new
break;
}
}
break;
}
}
@@
-79,7
+79,7
@@
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
return qc;
}
return qc;
}
-@@ -566
3,6 +5679
,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -566
6,6 +5682
,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
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;
ata_sff_port_init(ap);
return ap;
-@@ -568
4,6 +5703
,12 @@ static void ata_host_release(struct devi
+@@ -568
7,6 +5706
,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link);
kfree(ap->slave_link);
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;
}
kfree(ap);
host->ports[i] = NULL;
}
-@@ -613
0,7 +6155
,23 @@ int ata_host_register(struct ata_host *h
+@@ -613
3,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;
}
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
/*
* Define if arch has non-standard setup. This is a _PCI_ standard
-@@ -86
1,6 +864
,12 @@ struct ata_port {
+@@ -86
2,6 +865
,12 @@ struct ata_port {
#ifdef CONFIG_ATA_ACPI
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
#endif
#ifdef CONFIG_ATA_ACPI
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
#endif