diff options
author | Andrew Morton <akpm@osdl.org> | 2005-11-15 03:09:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-15 11:59:19 -0500 |
commit | d6a1a64aec2b2e2e13b629ed72afd319d8bce5da (patch) | |
tree | 6d6a85d0cbf697a94635a9f1749db7e3e1f8079f | |
parent | 93588e2284b6be1873cc0bb7fbf0947bdbf72830 (diff) |
[PATCH] hfc_usb: fix usb device table
We need to use the USB_DEVICE macro here, else the modinfo aliases go all wrong.
Also, correctly terminate the table, as noted by Dave Jones <davej@redhat.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/isdn/hisax/hfc_usb.c | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c index 32bf0d5d0f9a..f8457ef48826 100644 --- a/drivers/isdn/hisax/hfc_usb.c +++ b/drivers/isdn/hisax/hfc_usb.c | |||
@@ -71,78 +71,68 @@ typedef struct { | |||
71 | /****************************************/ | 71 | /****************************************/ |
72 | static struct usb_device_id hfcusb_idtab[] = { | 72 | static struct usb_device_id hfcusb_idtab[] = { |
73 | { | 73 | { |
74 | .idVendor = 0x0959, | 74 | USB_DEVICE(0x0959, 0x2bd0), |
75 | .idProduct = 0x2bd0, | ||
76 | .driver_info = (unsigned long) &((hfcsusb_vdata) | 75 | .driver_info = (unsigned long) &((hfcsusb_vdata) |
77 | {LED_OFF, {4, 0, 2, 1}, | 76 | {LED_OFF, {4, 0, 2, 1}, |
78 | "ISDN USB TA (Cologne Chip HFC-S USB based)"}), | 77 | "ISDN USB TA (Cologne Chip HFC-S USB based)"}), |
79 | }, | 78 | }, |
80 | { | 79 | { |
81 | .idVendor = 0x0675, | 80 | USB_DEVICE(0x0675, 0x1688), |
82 | .idProduct = 0x1688, | ||
83 | .driver_info = (unsigned long) &((hfcsusb_vdata) | 81 | .driver_info = (unsigned long) &((hfcsusb_vdata) |
84 | {LED_SCHEME1, {1, 2, 0, 0}, | 82 | {LED_SCHEME1, {1, 2, 0, 0}, |
85 | "DrayTek miniVigor 128 USB ISDN TA"}), | 83 | "DrayTek miniVigor 128 USB ISDN TA"}), |
86 | }, | 84 | }, |
87 | { | 85 | { |
88 | .idVendor = 0x07b0, | 86 | USB_DEVICE(0x07b0, 0x0007), |
89 | .idProduct = 0x0007, | ||
90 | .driver_info = (unsigned long) &((hfcsusb_vdata) | 87 | .driver_info = (unsigned long) &((hfcsusb_vdata) |
91 | {LED_SCHEME1, {0x80, -64, -32, -16}, | 88 | {LED_SCHEME1, {0x80, -64, -32, -16}, |
92 | "Billion tiny USB ISDN TA 128"}), | 89 | "Billion tiny USB ISDN TA 128"}), |
93 | }, | 90 | }, |
94 | { | 91 | { |
95 | .idVendor = 0x0742, | 92 | USB_DEVICE(0x0742, 0x2008), |
96 | .idProduct = 0x2008, | ||
97 | .driver_info = (unsigned long) &((hfcsusb_vdata) | 93 | .driver_info = (unsigned long) &((hfcsusb_vdata) |
98 | {LED_SCHEME1, {4, 0, 2, 1}, | 94 | {LED_SCHEME1, {4, 0, 2, 1}, |
99 | "Stollmann USB TA"}), | 95 | "Stollmann USB TA"}), |
100 | }, | 96 | }, |
101 | { | 97 | { |
102 | .idVendor = 0x0742, | 98 | USB_DEVICE(0x0742, 0x2009), |
103 | .idProduct = 0x2009, | ||
104 | .driver_info = (unsigned long) &((hfcsusb_vdata) | 99 | .driver_info = (unsigned long) &((hfcsusb_vdata) |
105 | {LED_SCHEME1, {4, 0, 2, 1}, | 100 | {LED_SCHEME1, {4, 0, 2, 1}, |
106 | "Aceex USB ISDN TA"}), | 101 | "Aceex USB ISDN TA"}), |
107 | }, | 102 | }, |
108 | { | 103 | { |
109 | .idVendor = 0x0742, | 104 | USB_DEVICE(0x0742, 0x200A), |
110 | .idProduct = 0x200A, | ||
111 | .driver_info = (unsigned long) &((hfcsusb_vdata) | 105 | .driver_info = (unsigned long) &((hfcsusb_vdata) |
112 | {LED_SCHEME1, {4, 0, 2, 1}, | 106 | {LED_SCHEME1, {4, 0, 2, 1}, |
113 | "OEM USB ISDN TA"}), | 107 | "OEM USB ISDN TA"}), |
114 | }, | 108 | }, |
115 | { | 109 | { |
116 | .idVendor = 0x08e3, | 110 | USB_DEVICE(0x08e3, 0x0301), |
117 | .idProduct = 0x0301, | ||
118 | .driver_info = (unsigned long) &((hfcsusb_vdata) | 111 | .driver_info = (unsigned long) &((hfcsusb_vdata) |
119 | {LED_SCHEME1, {2, 0, 1, 4}, | 112 | {LED_SCHEME1, {2, 0, 1, 4}, |
120 | "Olitec USB RNIS"}), | 113 | "Olitec USB RNIS"}), |
121 | }, | 114 | }, |
122 | { | 115 | { |
123 | .idVendor = 0x07fa, | 116 | USB_DEVICE(0x07fa, 0x0846), |
124 | .idProduct = 0x0846, | ||
125 | .driver_info = (unsigned long) &((hfcsusb_vdata) | 117 | .driver_info = (unsigned long) &((hfcsusb_vdata) |
126 | {LED_SCHEME1, {0x80, -64, -32, -16}, | 118 | {LED_SCHEME1, {0x80, -64, -32, -16}, |
127 | "Bewan Modem RNIS USB"}), | 119 | "Bewan Modem RNIS USB"}), |
128 | }, | 120 | }, |
129 | { | 121 | { |
130 | .idVendor = 0x07fa, | 122 | USB_DEVICE(0x07fa, 0x0847), |
131 | .idProduct = 0x0847, | ||
132 | .driver_info = (unsigned long) &((hfcsusb_vdata) | 123 | .driver_info = (unsigned long) &((hfcsusb_vdata) |
133 | {LED_SCHEME1, {0x80, -64, -32, -16}, | 124 | {LED_SCHEME1, {0x80, -64, -32, -16}, |
134 | "Djinn Numeris USB"}), | 125 | "Djinn Numeris USB"}), |
135 | }, | 126 | }, |
136 | { | 127 | { |
137 | .idVendor = 0x07b0, | 128 | USB_DEVICE(0x07b0, 0x0006), |
138 | .idProduct = 0x0006, | ||
139 | .driver_info = (unsigned long) &((hfcsusb_vdata) | 129 | .driver_info = (unsigned long) &((hfcsusb_vdata) |
140 | {LED_SCHEME1, {0x80, -64, -32, -16}, | 130 | {LED_SCHEME1, {0x80, -64, -32, -16}, |
141 | "Twister ISDN TA"}), | 131 | "Twister ISDN TA"}), |
142 | }, | 132 | }, |
133 | { } | ||
143 | }; | 134 | }; |
144 | 135 | ||
145 | |||
146 | /***************************************************************/ | 136 | /***************************************************************/ |
147 | /* structure defining input+output fifos (interrupt/bulk mode) */ | 137 | /* structure defining input+output fifos (interrupt/bulk mode) */ |
148 | /***************************************************************/ | 138 | /***************************************************************/ |