From b9d513158ee3b0b16cd6b17eb50774be4ab33386 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Sun, 8 Feb 2015 12:01:37 +0000 Subject: kernel: update 3.18 to 3.18.6 Signed-off-by: Luka Perkov SVN-Revision: 44318 --- target/linux/generic/patches-3.18/834-ledtrig-libata.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '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 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 /** * 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 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 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 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 /* * 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 -- cgit v1.2.3