diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800pci.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00soc.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00soc.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c index aca8c124f434..91cce2d0f6db 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c | |||
@@ -1225,7 +1225,7 @@ MODULE_LICENSE("GPL"); | |||
1225 | #ifdef CONFIG_RT2800PCI_SOC | 1225 | #ifdef CONFIG_RT2800PCI_SOC |
1226 | static int rt2800soc_probe(struct platform_device *pdev) | 1226 | static int rt2800soc_probe(struct platform_device *pdev) |
1227 | { | 1227 | { |
1228 | return rt2x00soc_probe(pdev, rt2800pci_ops); | 1228 | return rt2x00soc_probe(pdev, &rt2800pci_ops); |
1229 | } | 1229 | } |
1230 | 1230 | ||
1231 | static struct platform_driver rt2800soc_driver = { | 1231 | static struct platform_driver rt2800soc_driver = { |
diff --git a/drivers/net/wireless/rt2x00/rt2x00soc.c b/drivers/net/wireless/rt2x00/rt2x00soc.c index 4efdc96010f6..111c0ff5c6c7 100644 --- a/drivers/net/wireless/rt2x00/rt2x00soc.c +++ b/drivers/net/wireless/rt2x00/rt2x00soc.c | |||
@@ -112,6 +112,7 @@ exit_free_device: | |||
112 | 112 | ||
113 | return retval; | 113 | return retval; |
114 | } | 114 | } |
115 | EXPORT_SYMBOL_GPL(rt2x00soc_probe); | ||
115 | 116 | ||
116 | int rt2x00soc_remove(struct platform_device *pdev) | 117 | int rt2x00soc_remove(struct platform_device *pdev) |
117 | { | 118 | { |
diff --git a/drivers/net/wireless/rt2x00/rt2x00soc.h b/drivers/net/wireless/rt2x00/rt2x00soc.h index 4739edfe2f00..474cbfc1efc7 100644 --- a/drivers/net/wireless/rt2x00/rt2x00soc.h +++ b/drivers/net/wireless/rt2x00/rt2x00soc.h | |||
@@ -26,8 +26,6 @@ | |||
26 | #ifndef RT2X00SOC_H | 26 | #ifndef RT2X00SOC_H |
27 | #define RT2X00SOC_H | 27 | #define RT2X00SOC_H |
28 | 28 | ||
29 | #define KSEG1ADDR(__ptr) __ptr | ||
30 | |||
31 | /* | 29 | /* |
32 | * SoC driver handlers. | 30 | * SoC driver handlers. |
33 | */ | 31 | */ |
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index e77aec8d0a84..290d70bc5d22 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -2352,6 +2352,8 @@ static struct usb_device_id rt73usb_device_table[] = { | |||
2352 | { USB_DEVICE(0x0411, 0x00f4), USB_DEVICE_DATA(&rt73usb_ops) }, | 2352 | { USB_DEVICE(0x0411, 0x00f4), USB_DEVICE_DATA(&rt73usb_ops) }, |
2353 | { USB_DEVICE(0x0411, 0x0116), USB_DEVICE_DATA(&rt73usb_ops) }, | 2353 | { USB_DEVICE(0x0411, 0x0116), USB_DEVICE_DATA(&rt73usb_ops) }, |
2354 | { USB_DEVICE(0x0411, 0x0119), USB_DEVICE_DATA(&rt73usb_ops) }, | 2354 | { USB_DEVICE(0x0411, 0x0119), USB_DEVICE_DATA(&rt73usb_ops) }, |
2355 | /* CEIVA */ | ||
2356 | { USB_DEVICE(0x178d, 0x02be), USB_DEVICE_DATA(&rt73usb_ops) }, | ||
2355 | /* CNet */ | 2357 | /* CNet */ |
2356 | { USB_DEVICE(0x1371, 0x9022), USB_DEVICE_DATA(&rt73usb_ops) }, | 2358 | { USB_DEVICE(0x1371, 0x9022), USB_DEVICE_DATA(&rt73usb_ops) }, |
2357 | { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) }, | 2359 | { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) }, |