aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/zd1211rw
diff options
context:
space:
mode:
authorHin-Tak Leung <hintak.leung@gmail.com>2009-06-17 22:53:26 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 15:01:41 -0400
commit3bfbe80e4462c22e5dc42a00b2b394e347f4aa09 (patch)
treec58cb8daab7467825d9bf042ff2b59ae4c3bff1b /drivers/net/wireless/zd1211rw
parent83f5e2cf79390f7ca909b7035dd415230257cc4d (diff)
zd1211rw: sort vid/pid pairs by numerical value
In the past ids were inserted in no particular order and it has become hard to see what ids are already included or not. This patch sorts the ids by numerical value and has no functional effect. Signed-off-by: Hin-Tak Leung <htl10@users.sourceforge.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/zd1211rw')
-rw-r--r--drivers/net/wireless/zd1211rw/zd_usb.c73
1 files changed, 37 insertions, 36 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index 0e6e44689cc6..07d7ab674a0f 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -36,58 +36,59 @@
36 36
37static struct usb_device_id usb_ids[] = { 37static struct usb_device_id usb_ids[] = {
38 /* ZD1211 */ 38 /* ZD1211 */
39 { USB_DEVICE(0x0105, 0x145f), .driver_info = DEVICE_ZD1211 },
40 { USB_DEVICE(0x0586, 0x3401), .driver_info = DEVICE_ZD1211 },
41 { USB_DEVICE(0x0586, 0x3402), .driver_info = DEVICE_ZD1211 },
42 { USB_DEVICE(0x0586, 0x3407), .driver_info = DEVICE_ZD1211 },
43 { USB_DEVICE(0x0586, 0x3409), .driver_info = DEVICE_ZD1211 },
44 { USB_DEVICE(0x079b, 0x004a), .driver_info = DEVICE_ZD1211 },
45 { USB_DEVICE(0x07b8, 0x6001), .driver_info = DEVICE_ZD1211 },
39 { USB_DEVICE(0x0ace, 0x1211), .driver_info = DEVICE_ZD1211 }, 46 { USB_DEVICE(0x0ace, 0x1211), .driver_info = DEVICE_ZD1211 },
40 { USB_DEVICE(0x0ace, 0xa211), .driver_info = DEVICE_ZD1211 }, 47 { USB_DEVICE(0x0ace, 0xa211), .driver_info = DEVICE_ZD1211 },
41 { USB_DEVICE(0x126f, 0xa006), .driver_info = DEVICE_ZD1211 }, 48 { USB_DEVICE(0x0b05, 0x170c), .driver_info = DEVICE_ZD1211 },
42 { USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 }, 49 { USB_DEVICE(0x0b3b, 0x1630), .driver_info = DEVICE_ZD1211 },
50 { USB_DEVICE(0x0b3b, 0x5630), .driver_info = DEVICE_ZD1211 },
43 { USB_DEVICE(0x0df6, 0x9071), .driver_info = DEVICE_ZD1211 }, 51 { USB_DEVICE(0x0df6, 0x9071), .driver_info = DEVICE_ZD1211 },
44 { USB_DEVICE(0x0df6, 0x9075), .driver_info = DEVICE_ZD1211 }, 52 { USB_DEVICE(0x0df6, 0x9075), .driver_info = DEVICE_ZD1211 },
45 { USB_DEVICE(0x157e, 0x300b), .driver_info = DEVICE_ZD1211 }, 53 { USB_DEVICE(0x126f, 0xa006), .driver_info = DEVICE_ZD1211 },
46 { USB_DEVICE(0x079b, 0x004a), .driver_info = DEVICE_ZD1211 }, 54 { USB_DEVICE(0x129b, 0x1666), .driver_info = DEVICE_ZD1211 },
47 { USB_DEVICE(0x1740, 0x2000), .driver_info = DEVICE_ZD1211 }, 55 { USB_DEVICE(0x13b1, 0x001e), .driver_info = DEVICE_ZD1211 },
48 { USB_DEVICE(0x157e, 0x3204), .driver_info = DEVICE_ZD1211 },
49 { USB_DEVICE(0x0586, 0x3402), .driver_info = DEVICE_ZD1211 },
50 { USB_DEVICE(0x0b3b, 0x5630), .driver_info = DEVICE_ZD1211 },
51 { USB_DEVICE(0x0b05, 0x170c), .driver_info = DEVICE_ZD1211 },
52 { USB_DEVICE(0x1435, 0x0711), .driver_info = DEVICE_ZD1211 }, 56 { USB_DEVICE(0x1435, 0x0711), .driver_info = DEVICE_ZD1211 },
53 { USB_DEVICE(0x0586, 0x3409), .driver_info = DEVICE_ZD1211 },
54 { USB_DEVICE(0x0b3b, 0x1630), .driver_info = DEVICE_ZD1211 },
55 { USB_DEVICE(0x0586, 0x3401), .driver_info = DEVICE_ZD1211 },
56 { USB_DEVICE(0x14ea, 0xab13), .driver_info = DEVICE_ZD1211 }, 57 { USB_DEVICE(0x14ea, 0xab13), .driver_info = DEVICE_ZD1211 },
57 { USB_DEVICE(0x13b1, 0x001e), .driver_info = DEVICE_ZD1211 },
58 { USB_DEVICE(0x0586, 0x3407), .driver_info = DEVICE_ZD1211 },
59 { USB_DEVICE(0x129b, 0x1666), .driver_info = DEVICE_ZD1211 },
60 { USB_DEVICE(0x157e, 0x300a), .driver_info = DEVICE_ZD1211 }, 58 { USB_DEVICE(0x157e, 0x300a), .driver_info = DEVICE_ZD1211 },
61 { USB_DEVICE(0x0105, 0x145f), .driver_info = DEVICE_ZD1211 }, 59 { USB_DEVICE(0x157e, 0x300b), .driver_info = DEVICE_ZD1211 },
60 { USB_DEVICE(0x157e, 0x3204), .driver_info = DEVICE_ZD1211 },
61 { USB_DEVICE(0x1740, 0x2000), .driver_info = DEVICE_ZD1211 },
62 { USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 },
62 /* ZD1211B */ 63 /* ZD1211B */
64 { USB_DEVICE(0x0053, 0x5301), .driver_info = DEVICE_ZD1211B },
65 { USB_DEVICE(0x0411, 0x00da), .driver_info = DEVICE_ZD1211B },
66 { USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B },
67 { USB_DEVICE(0x0471, 0x1237), .driver_info = DEVICE_ZD1211B },
68 { USB_DEVICE(0x050d, 0x705c), .driver_info = DEVICE_ZD1211B },
63 { USB_DEVICE(0x054c, 0x0257), .driver_info = DEVICE_ZD1211B }, 69 { USB_DEVICE(0x054c, 0x0257), .driver_info = DEVICE_ZD1211B },
64 { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B }, 70 { USB_DEVICE(0x0586, 0x340a), .driver_info = DEVICE_ZD1211B },
65 { USB_DEVICE(0x0ace, 0xb215), .driver_info = DEVICE_ZD1211B }, 71 { USB_DEVICE(0x0586, 0x340f), .driver_info = DEVICE_ZD1211B },
66 { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B }, 72 { USB_DEVICE(0x0586, 0x3410), .driver_info = DEVICE_ZD1211B },
73 { USB_DEVICE(0x0586, 0x3412), .driver_info = DEVICE_ZD1211B },
74 { USB_DEVICE(0x0586, 0x3413), .driver_info = DEVICE_ZD1211B },
67 { USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B }, 75 { USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B },
68 { USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B }, 76 { USB_DEVICE(0x07b8, 0x6001), .driver_info = DEVICE_ZD1211B },
69 { USB_DEVICE(0x050d, 0x705c), .driver_info = DEVICE_ZD1211B }, 77 { USB_DEVICE(0x07fa, 0x1196), .driver_info = DEVICE_ZD1211B },
78 { USB_DEVICE(0x083a, 0x4505), .driver_info = DEVICE_ZD1211B },
70 { USB_DEVICE(0x083a, 0xe503), .driver_info = DEVICE_ZD1211B }, 79 { USB_DEVICE(0x083a, 0xe503), .driver_info = DEVICE_ZD1211B },
71 { USB_DEVICE(0x083a, 0xe506), .driver_info = DEVICE_ZD1211B }, 80 { USB_DEVICE(0x083a, 0xe506), .driver_info = DEVICE_ZD1211B },
72 { USB_DEVICE(0x083a, 0x4505), .driver_info = DEVICE_ZD1211B }, 81 { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
73 { USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B }, 82 { USB_DEVICE(0x0ace, 0xb215), .driver_info = DEVICE_ZD1211B },
74 { USB_DEVICE(0x13b1, 0x0024), .driver_info = DEVICE_ZD1211B },
75 { USB_DEVICE(0x0586, 0x340f), .driver_info = DEVICE_ZD1211B },
76 { USB_DEVICE(0x0b05, 0x171b), .driver_info = DEVICE_ZD1211B }, 83 { USB_DEVICE(0x0b05, 0x171b), .driver_info = DEVICE_ZD1211B },
77 { USB_DEVICE(0x0586, 0x3410), .driver_info = DEVICE_ZD1211B },
78 { USB_DEVICE(0x0baf, 0x0121), .driver_info = DEVICE_ZD1211B }, 84 { USB_DEVICE(0x0baf, 0x0121), .driver_info = DEVICE_ZD1211B },
79 { USB_DEVICE(0x0586, 0x3412), .driver_info = DEVICE_ZD1211B },
80 { USB_DEVICE(0x0586, 0x3413), .driver_info = DEVICE_ZD1211B },
81 { USB_DEVICE(0x0053, 0x5301), .driver_info = DEVICE_ZD1211B },
82 { USB_DEVICE(0x0411, 0x00da), .driver_info = DEVICE_ZD1211B },
83 { USB_DEVICE(0x2019, 0x5303), .driver_info = DEVICE_ZD1211B },
84 { USB_DEVICE(0x129b, 0x1667), .driver_info = DEVICE_ZD1211B },
85 { USB_DEVICE(0x0cde, 0x001a), .driver_info = DEVICE_ZD1211B }, 85 { USB_DEVICE(0x0cde, 0x001a), .driver_info = DEVICE_ZD1211B },
86 { USB_DEVICE(0x0586, 0x340a), .driver_info = DEVICE_ZD1211B },
87 { USB_DEVICE(0x0471, 0x1237), .driver_info = DEVICE_ZD1211B },
88 { USB_DEVICE(0x07fa, 0x1196), .driver_info = DEVICE_ZD1211B },
89 { USB_DEVICE(0x0df6, 0x0036), .driver_info = DEVICE_ZD1211B }, 86 { USB_DEVICE(0x0df6, 0x0036), .driver_info = DEVICE_ZD1211B },
90 { USB_DEVICE(0x07b8, 0x6001), .driver_info = DEVICE_ZD1211B }, 87 { USB_DEVICE(0x129b, 0x1667), .driver_info = DEVICE_ZD1211B },
88 { USB_DEVICE(0x13b1, 0x0024), .driver_info = DEVICE_ZD1211B },
89 { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
90 { USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B },
91 { USB_DEVICE(0x2019, 0x5303), .driver_info = DEVICE_ZD1211B },
91 /* "Driverless" devices that need ejecting */ 92 /* "Driverless" devices that need ejecting */
92 { USB_DEVICE(0x0ace, 0x2011), .driver_info = DEVICE_INSTALLER }, 93 { USB_DEVICE(0x0ace, 0x2011), .driver_info = DEVICE_INSTALLER },
93 { USB_DEVICE(0x0ace, 0x20ff), .driver_info = DEVICE_INSTALLER }, 94 { USB_DEVICE(0x0ace, 0x20ff), .driver_info = DEVICE_INSTALLER },