mac80211: merge an idle handling fix (fixes ath9k_htc client mode), refresh patches
[openwrt/staging/mkresin.git] / package / mac80211 / patches / 613-rt2x00-fixup-symbols.patch
1 --- a/drivers/net/wireless/rt2x00/rt2800pci.c
2 +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
3 @@ -1179,7 +1179,7 @@ MODULE_DEVICE_TABLE(pci, rt2800pci_devic
4 #endif /* CONFIG_PCI */
5 MODULE_LICENSE("GPL");
6
7 -#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)
8 +#if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)
9 static int rt2800soc_probe(struct platform_device *pdev)
10 {
11 return rt2x00soc_probe(pdev, &rt2800pci_ops);
12 @@ -1203,7 +1203,7 @@ static struct platform_driver rt2800soc_
13 .suspend = rt2x00soc_suspend,
14 .resume = rt2x00soc_resume,
15 };
16 -#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */
17 +#endif /* CONFIG_SOC_RT288X || CONFIG_SOC_RT305X */
18
19 #ifdef CONFIG_PCI
20 static int rt2800pci_probe(struct pci_dev *pci_dev,
21 @@ -1226,7 +1226,7 @@ static int __init rt2800pci_init(void)
22 {
23 int ret = 0;
24
25 -#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)
26 +#if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)
27 ret = platform_driver_register(&rt2800soc_driver);
28 if (ret)
29 return ret;
30 @@ -1234,7 +1234,7 @@ static int __init rt2800pci_init(void)
31 #ifdef CONFIG_PCI
32 ret = pci_register_driver(&rt2800pci_driver);
33 if (ret) {
34 -#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)
35 +#if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)
36 platform_driver_unregister(&rt2800soc_driver);
37 #endif
38 return ret;
39 @@ -1249,7 +1249,7 @@ static void __exit rt2800pci_exit(void)
40 #ifdef CONFIG_PCI
41 pci_unregister_driver(&rt2800pci_driver);
42 #endif
43 -#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)
44 +#if defined(CONFIG_SOC_RT288X) || defined(CONFIG_SOC_RT305X)
45 platform_driver_unregister(&rt2800soc_driver);
46 #endif
47 }