aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2013-07-14 18:28:02 +0000
committerJohn Crispin <john@openwrt.org>2013-07-14 18:28:02 +0000
commit955662ec4776d2b7dbe68882f46950a1510347a9 (patch)
tree8dc023d19b2566b6fdf8194ed7218d008120368f /target/linux
parent7d7c2ff5f9fd6f195119961fd696cd4193ebf3b5 (diff)
downloadupstream-955662ec4776d2b7dbe68882f46950a1510347a9.tar.gz
upstream-955662ec4776d2b7dbe68882f46950a1510347a9.tar.bz2
upstream-955662ec4776d2b7dbe68882f46950a1510347a9.zip
lantiq: apply [37258] also to the 3.9 kernel patches
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 37317
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/lantiq/patches-3.9/0018-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch12
1 files changed, 2 insertions, 10 deletions
diff --git a/target/linux/lantiq/patches-3.9/0018-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-3.9/0018-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
index d589f47e1f..403ee97a83 100644
--- a/target/linux/lantiq/patches-3.9/0018-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
+++ b/target/linux/lantiq/patches-3.9/0018-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
@@ -194,7 +194,7 @@ Subject: [PATCH 18/22] owrt: lantiq: wifi and ethernet eeprom handling
+{
+ return platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe);
+}
-+late_initcall(of_ath9k_eeprom_init);
++arch_initcall(of_ath9k_eeprom_init);
+
+
+static int ath5k_pci_plat_dev_init(struct pci_dev *dev)
@@ -298,7 +298,7 @@ Subject: [PATCH 18/22] owrt: lantiq: wifi and ethernet eeprom handling
+{
+ return platform_driver_probe(&ath5k_eeprom_driver, of_ath5k_eeprom_probe);
+}
-+late_initcall(of_ath5k_eeprom_init);
++device_initcall(of_ath5k_eeprom_init);
--- /dev/null
+++ b/arch/mips/lantiq/xway/eth_mac.c
@@ -0,0 +1,76 @@
@@ -553,11 +553,3 @@ Subject: [PATCH 18/22] owrt: lantiq: wifi and ethernet eeprom handling
+ return platform_driver_probe(&ralink_eeprom_driver, of_ralink_eeprom_probe);
+}
+device_initcall(of_ralink_eeprom_init);
---- a/arch/mips/pci/pci-lantiq.c
-+++ b/arch/mips/pci/pci-lantiq.c
-@@ -260,4 +260,4 @@ int __init pcibios_init(void)
- return ret;
- }
-
--arch_initcall(pcibios_init);
-+late_initcall(pcibios_init);