diff options
author | John Crispin <blogic@openwrt.org> | 2013-07-11 21:16:34 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2013-07-11 21:16:34 +0000 |
commit | 1eff8c3206c54409f9dc449b39a94de4bad30f70 (patch) | |
tree | 1bc527806b1a69be6853729fce4208c1814012ad /target | |
parent | 7faed562d85c0df6511f174ef2fd2b0d34d9e825 (diff) | |
download | upstream-1eff8c3206c54409f9dc449b39a94de4bad30f70.tar.gz upstream-1eff8c3206c54409f9dc449b39a94de4bad30f70.tar.bz2 upstream-1eff8c3206c54409f9dc449b39a94de4bad30f70.zip |
lantiq: revert 36778 as it breaks irq assignment to pci devices
Reported-by: Matti Laakso
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37258 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r-- | target/linux/lantiq/patches-3.8/0037-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/target/linux/lantiq/patches-3.8/0037-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-3.8/0037-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch index e98a4c08ae..ca88c74330 100644 --- a/target/linux/lantiq/patches-3.8/0037-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch +++ b/target/linux/lantiq/patches-3.8/0037-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch @@ -194,7 +194,7 @@ Subject: [PATCH 37/40] 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 37/40] 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 @@ @@ -586,11 +586,3 @@ Subject: [PATCH 37/40] owrt: lantiq: wifi and ethernet eeprom handling priv->clk_ppe = clk_get(&pdev->dev, NULL); if (IS_ERR(priv->clk_ppe)) ---- 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); |