lantiq: revert 36778 as it breaks irq assignment to pci devices
Reported-by: Matti Laakso Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 37258
This commit is contained in:
parent
3c306f9d07
commit
93c4359512
1 changed files with 2 additions and 10 deletions
|
@ -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);
|
+ 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)
|
+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);
|
+ 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
|
--- /dev/null
|
||||||
+++ b/arch/mips/lantiq/xway/eth_mac.c
|
+++ b/arch/mips/lantiq/xway/eth_mac.c
|
||||||
@@ -0,0 +1,76 @@
|
@@ -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);
|
priv->clk_ppe = clk_get(&pdev->dev, NULL);
|
||||||
if (IS_ERR(priv->clk_ppe))
|
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);
|
|
||||||
|
|
Loading…
Reference in a new issue