diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
commit | 9a495f6bbbcb294b9926f4ec32e5bbb339395d00 (patch) | |
tree | c76b5e53fffd1d6238ba09da9d8bb7a6bde9e474 /target/linux/adm8668 | |
parent | 3951f9492f31b59602a9a7c46fbb041be0929be0 (diff) | |
download | upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.gz upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.bz2 upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.zip |
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43564
Diffstat (limited to 'target/linux/adm8668')
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 { |