aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm8668
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
commit6e4472e69e89aa56ad8c0e6f90415a2b8da36eba (patch)
treeb35c1688c3303eb7f7dff2304798f8eb320812fb /target/linux/adm8668
parenta899dbd4e32835b0a1d917479d10e5a2744c273c (diff)
downloadmaster-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.gz
master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.bz2
master-187ad058-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.zip
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm8668')
-rw-r--r--target/linux/adm8668/patches-3.14/004-tulip_pci_split.patch4
-rw-r--r--target/linux/adm8668/patches-3.14/005-tulip_platform.patch2
-rw-r--r--target/linux/adm8668/patches-3.14/200-amba_pl010_hacks.patch4
3 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/adm8668/patches-3.14/004-tulip_pci_split.patch b/target/linux/adm8668/patches-3.14/004-tulip_pci_split.patch
index c37a611645..05844eb495 100644
--- a/target/linux/adm8668/patches-3.14/004-tulip_pci_split.patch
+++ b/target/linux/adm8668/patches-3.14/004-tulip_pci_split.patch
@@ -197,7 +197,7 @@
}
-@@ -887,7 +913,9 @@ static int tulip_ethtool_set_wol(struct
+@@ -887,7 +913,9 @@ static int tulip_ethtool_set_wol(struct
return -EOPNOTSUPP;
tp->wolinfo.wolopts = wolinfo->wolopts;
@@ -295,7 +295,7 @@
.name = DRV_NAME,
.id_table = tulip_pci_tbl,
.probe = tulip_init_one,
-@@ -1974,10 +2014,12 @@ static struct pci_driver tulip_driver =
+@@ -1974,10 +2014,12 @@ static struct pci_driver tulip_driver =
.resume = tulip_resume,
#endif /* CONFIG_PM */
};
diff --git a/target/linux/adm8668/patches-3.14/005-tulip_platform.patch b/target/linux/adm8668/patches-3.14/005-tulip_platform.patch
index 64fa3dc4c2..96ebcbe1b9 100644
--- a/target/linux/adm8668/patches-3.14/005-tulip_platform.patch
+++ b/target/linux/adm8668/patches-3.14/005-tulip_platform.patch
@@ -122,7 +122,7 @@
}
-@@ -916,6 +951,9 @@ static int tulip_ethtool_set_wol(struct
+@@ -916,6 +951,9 @@ static int tulip_ethtool_set_wol(struct
#ifdef CONFIG_TULIP_PCI
device_set_wakeup_enable(tp->kdev, tp->wolinfo.wolopts);
#endif
diff --git a/target/linux/adm8668/patches-3.14/200-amba_pl010_hacks.patch b/target/linux/adm8668/patches-3.14/200-amba_pl010_hacks.patch
index 554eedc67d..dad696086c 100644
--- a/target/linux/adm8668/patches-3.14/200-amba_pl010_hacks.patch
+++ b/target/linux/adm8668/patches-3.14/200-amba_pl010_hacks.patch
@@ -266,7 +266,7 @@
}
static void
-@@ -573,8 +572,8 @@ pl010_console_write(struct console *co,
+@@ -573,8 +572,8 @@ pl010_console_write(struct console *co,
/*
* First save the CR then disable the interrupts
*/
@@ -277,7 +277,7 @@
uart_console_write(&uap->port, s, count, pl010_console_putchar);
-@@ -583,10 +582,10 @@ pl010_console_write(struct console *co,
+@@ -583,10 +582,10 @@ pl010_console_write(struct console *co,
* and restore the TCR
*/
do {