aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00
diff options
context:
space:
mode:
authorGertjan van Wingerde <gwingerde@gmail.com>2009-12-22 18:03:22 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-12-28 16:31:37 -0500
commit00e23ce219a9ac6c5f764342ca13f8ac1bab0382 (patch)
treefc9b9a10172d59ad6349a7a1f2772b5a111c4089 /drivers/net/wireless/rt2x00
parentbaeb66fe2306783e3b9a492b03882f2e249b2eeb (diff)
rt2x00: Fix checks for rt2800 SOC support.
Fix checking for SOC support in rt2800pci. The wrong config (an unexisting one) was checked. Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00')
-rw-r--r--drivers/net/wireless/rt2x00/rt2800pci.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 458378c4e500..96e024477b2f 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -52,8 +52,8 @@
52#define CONFIG_RT2800PCI_PCI 52#define CONFIG_RT2800PCI_PCI
53#endif 53#endif
54 54
55#ifdef CONFIG_RT2800PCI_WISOC_MODULE 55#ifdef CONFIG_RT2800PCI_SOC_MODULE
56#define CONFIG_RT2800PCI_WISOC 56#define CONFIG_RT2800PCI_SOC
57#endif 57#endif
58 58
59/* 59/*
@@ -87,7 +87,7 @@ static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token)
87 rt2800_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); 87 rt2800_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
88} 88}
89 89
90#ifdef CONFIG_RT2800PCI_WISOC 90#ifdef CONFIG_RT2800PCI_SOC
91static void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) 91static void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
92{ 92{
93 u32 *base_addr = (u32 *) KSEG1ADDR(0x1F040000); /* XXX for RT3052 */ 93 u32 *base_addr = (u32 *) KSEG1ADDR(0x1F040000); /* XXX for RT3052 */
@@ -98,7 +98,7 @@ static void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
98static inline void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) 98static inline void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
99{ 99{
100} 100}
101#endif /* CONFIG_RT2800PCI_WISOC */ 101#endif /* CONFIG_RT2800PCI_SOC */
102 102
103#ifdef CONFIG_RT2800PCI_PCI 103#ifdef CONFIG_RT2800PCI_PCI
104static void rt2800pci_eepromregister_read(struct eeprom_93cx6 *eeprom) 104static void rt2800pci_eepromregister_read(struct eeprom_93cx6 *eeprom)
@@ -1251,7 +1251,7 @@ MODULE_DEVICE_TABLE(pci, rt2800pci_device_table);
1251#endif /* CONFIG_RT2800PCI_PCI */ 1251#endif /* CONFIG_RT2800PCI_PCI */
1252MODULE_LICENSE("GPL"); 1252MODULE_LICENSE("GPL");
1253 1253
1254#ifdef CONFIG_RT2800PCI_WISOC 1254#ifdef CONFIG_RT2800PCI_SOC
1255#if defined(CONFIG_RALINK_RT288X) 1255#if defined(CONFIG_RALINK_RT288X)
1256__rt2x00soc_probe(RT2880, &rt2800pci_ops); 1256__rt2x00soc_probe(RT2880, &rt2800pci_ops);
1257#elif defined(CONFIG_RALINK_RT305X) 1257#elif defined(CONFIG_RALINK_RT305X)
@@ -1269,7 +1269,7 @@ static struct platform_driver rt2800soc_driver = {
1269 .suspend = rt2x00soc_suspend, 1269 .suspend = rt2x00soc_suspend,
1270 .resume = rt2x00soc_resume, 1270 .resume = rt2x00soc_resume,
1271}; 1271};
1272#endif /* CONFIG_RT2800PCI_WISOC */ 1272#endif /* CONFIG_RT2800PCI_SOC */
1273 1273
1274#ifdef CONFIG_RT2800PCI_PCI 1274#ifdef CONFIG_RT2800PCI_PCI
1275static struct pci_driver rt2800pci_driver = { 1275static struct pci_driver rt2800pci_driver = {
@@ -1286,7 +1286,7 @@ static int __init rt2800pci_init(void)
1286{ 1286{
1287 int ret = 0; 1287 int ret = 0;
1288 1288
1289#ifdef CONFIG_RT2800PCI_WISOC 1289#ifdef CONFIG_RT2800PCI_SOC
1290 ret = platform_driver_register(&rt2800soc_driver); 1290 ret = platform_driver_register(&rt2800soc_driver);
1291 if (ret) 1291 if (ret)
1292 return ret; 1292 return ret;
@@ -1294,7 +1294,7 @@ static int __init rt2800pci_init(void)
1294#ifdef CONFIG_RT2800PCI_PCI 1294#ifdef CONFIG_RT2800PCI_PCI
1295 ret = pci_register_driver(&rt2800pci_driver); 1295 ret = pci_register_driver(&rt2800pci_driver);
1296 if (ret) { 1296 if (ret) {
1297#ifdef CONFIG_RT2800PCI_WISOC 1297#ifdef CONFIG_RT2800PCI_SOC
1298 platform_driver_unregister(&rt2800soc_driver); 1298 platform_driver_unregister(&rt2800soc_driver);
1299#endif 1299#endif
1300 return ret; 1300 return ret;
@@ -1309,7 +1309,7 @@ static void __exit rt2800pci_exit(void)
1309#ifdef CONFIG_RT2800PCI_PCI 1309#ifdef CONFIG_RT2800PCI_PCI
1310 pci_unregister_driver(&rt2800pci_driver); 1310 pci_unregister_driver(&rt2800pci_driver);
1311#endif 1311#endif
1312#ifdef CONFIG_RT2800PCI_WISOC 1312#ifdef CONFIG_RT2800PCI_SOC
1313 platform_driver_unregister(&rt2800soc_driver); 1313 platform_driver_unregister(&rt2800soc_driver);
1314#endif 1314#endif
1315} 1315}