diff options
-rw-r--r-- | arch/mips/configs/rm200_defconfig | 9 | ||||
-rw-r--r-- | arch/powerpc/configs/c2k_defconfig | 12 | ||||
-rw-r--r-- | arch/powerpc/configs/g5_defconfig | 12 | ||||
-rw-r--r-- | arch/powerpc/configs/maple_defconfig | 12 | ||||
-rw-r--r-- | arch/powerpc/configs/pmac32_defconfig | 12 | ||||
-rw-r--r-- | drivers/usb/serial/Kconfig | 78 |
6 files changed, 0 insertions, 135 deletions
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index 99679e514042..5f71aa598b06 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig | |||
@@ -325,15 +325,6 @@ CONFIG_USB_SERIAL_EDGEPORT=m | |||
325 | CONFIG_USB_SERIAL_EDGEPORT_TI=m | 325 | CONFIG_USB_SERIAL_EDGEPORT_TI=m |
326 | CONFIG_USB_SERIAL_KEYSPAN_PDA=m | 326 | CONFIG_USB_SERIAL_KEYSPAN_PDA=m |
327 | CONFIG_USB_SERIAL_KEYSPAN=m | 327 | CONFIG_USB_SERIAL_KEYSPAN=m |
328 | CONFIG_USB_SERIAL_KEYSPAN_MPR=y | ||
329 | CONFIG_USB_SERIAL_KEYSPAN_USA28X=y | ||
330 | CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y | ||
331 | CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y | ||
332 | CONFIG_USB_SERIAL_KEYSPAN_USA19W=y | ||
333 | CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y | ||
334 | CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y | ||
335 | CONFIG_USB_SERIAL_KEYSPAN_USA49W=y | ||
336 | CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | ||
337 | CONFIG_USB_SERIAL_KLSI=m | 328 | CONFIG_USB_SERIAL_KLSI=m |
338 | CONFIG_USB_SERIAL_KOBIL_SCT=m | 329 | CONFIG_USB_SERIAL_KOBIL_SCT=m |
339 | CONFIG_USB_SERIAL_MCT_U232=m | 330 | CONFIG_USB_SERIAL_MCT_U232=m |
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig index f1552af9eecc..4bb832a41d55 100644 --- a/arch/powerpc/configs/c2k_defconfig +++ b/arch/powerpc/configs/c2k_defconfig | |||
@@ -272,18 +272,6 @@ CONFIG_USB_SERIAL_EDGEPORT=m | |||
272 | CONFIG_USB_SERIAL_EDGEPORT_TI=m | 272 | CONFIG_USB_SERIAL_EDGEPORT_TI=m |
273 | CONFIG_USB_SERIAL_KEYSPAN_PDA=m | 273 | CONFIG_USB_SERIAL_KEYSPAN_PDA=m |
274 | CONFIG_USB_SERIAL_KEYSPAN=m | 274 | CONFIG_USB_SERIAL_KEYSPAN=m |
275 | CONFIG_USB_SERIAL_KEYSPAN_MPR=y | ||
276 | CONFIG_USB_SERIAL_KEYSPAN_USA28=y | ||
277 | CONFIG_USB_SERIAL_KEYSPAN_USA28X=y | ||
278 | CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y | ||
279 | CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y | ||
280 | CONFIG_USB_SERIAL_KEYSPAN_USA19=y | ||
281 | CONFIG_USB_SERIAL_KEYSPAN_USA18X=y | ||
282 | CONFIG_USB_SERIAL_KEYSPAN_USA19W=y | ||
283 | CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y | ||
284 | CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y | ||
285 | CONFIG_USB_SERIAL_KEYSPAN_USA49W=y | ||
286 | CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | ||
287 | CONFIG_USB_SERIAL_KLSI=m | 275 | CONFIG_USB_SERIAL_KLSI=m |
288 | CONFIG_USB_SERIAL_KOBIL_SCT=m | 276 | CONFIG_USB_SERIAL_KOBIL_SCT=m |
289 | CONFIG_USB_SERIAL_MCT_U232=m | 277 | CONFIG_USB_SERIAL_MCT_U232=m |
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 063817fee61c..67c39f4acede 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig | |||
@@ -189,18 +189,6 @@ CONFIG_USB_SERIAL_GARMIN=m | |||
189 | CONFIG_USB_SERIAL_IPW=m | 189 | CONFIG_USB_SERIAL_IPW=m |
190 | CONFIG_USB_SERIAL_KEYSPAN_PDA=m | 190 | CONFIG_USB_SERIAL_KEYSPAN_PDA=m |
191 | CONFIG_USB_SERIAL_KEYSPAN=m | 191 | CONFIG_USB_SERIAL_KEYSPAN=m |
192 | CONFIG_USB_SERIAL_KEYSPAN_MPR=y | ||
193 | CONFIG_USB_SERIAL_KEYSPAN_USA28=y | ||
194 | CONFIG_USB_SERIAL_KEYSPAN_USA28X=y | ||
195 | CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y | ||
196 | CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y | ||
197 | CONFIG_USB_SERIAL_KEYSPAN_USA19=y | ||
198 | CONFIG_USB_SERIAL_KEYSPAN_USA18X=y | ||
199 | CONFIG_USB_SERIAL_KEYSPAN_USA19W=y | ||
200 | CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y | ||
201 | CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y | ||
202 | CONFIG_USB_SERIAL_KEYSPAN_USA49W=y | ||
203 | CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | ||
204 | CONFIG_USB_SERIAL_KLSI=m | 192 | CONFIG_USB_SERIAL_KLSI=m |
205 | CONFIG_USB_SERIAL_KOBIL_SCT=m | 193 | CONFIG_USB_SERIAL_KOBIL_SCT=m |
206 | CONFIG_USB_SERIAL_MCT_U232=m | 194 | CONFIG_USB_SERIAL_MCT_U232=m |
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig index 078cdb427fc9..59e47ec85336 100644 --- a/arch/powerpc/configs/maple_defconfig +++ b/arch/powerpc/configs/maple_defconfig | |||
@@ -82,18 +82,6 @@ CONFIG_USB_SERIAL_CYPRESS_M8=m | |||
82 | CONFIG_USB_SERIAL_GARMIN=m | 82 | CONFIG_USB_SERIAL_GARMIN=m |
83 | CONFIG_USB_SERIAL_IPW=m | 83 | CONFIG_USB_SERIAL_IPW=m |
84 | CONFIG_USB_SERIAL_KEYSPAN=y | 84 | CONFIG_USB_SERIAL_KEYSPAN=y |
85 | CONFIG_USB_SERIAL_KEYSPAN_MPR=y | ||
86 | CONFIG_USB_SERIAL_KEYSPAN_USA28=y | ||
87 | CONFIG_USB_SERIAL_KEYSPAN_USA28X=y | ||
88 | CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y | ||
89 | CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y | ||
90 | CONFIG_USB_SERIAL_KEYSPAN_USA19=y | ||
91 | CONFIG_USB_SERIAL_KEYSPAN_USA18X=y | ||
92 | CONFIG_USB_SERIAL_KEYSPAN_USA19W=y | ||
93 | CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y | ||
94 | CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y | ||
95 | CONFIG_USB_SERIAL_KEYSPAN_USA49W=y | ||
96 | CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | ||
97 | CONFIG_USB_SERIAL_TI=m | 85 | CONFIG_USB_SERIAL_TI=m |
98 | CONFIG_EXT2_FS=y | 86 | CONFIG_EXT2_FS=y |
99 | CONFIG_EXT4_FS=y | 87 | CONFIG_EXT4_FS=y |
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index 1aab9a62a681..62948d198d7f 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig | |||
@@ -264,18 +264,6 @@ CONFIG_USB_SERIAL_VISOR=m | |||
264 | CONFIG_USB_SERIAL_IPAQ=m | 264 | CONFIG_USB_SERIAL_IPAQ=m |
265 | CONFIG_USB_SERIAL_KEYSPAN_PDA=m | 265 | CONFIG_USB_SERIAL_KEYSPAN_PDA=m |
266 | CONFIG_USB_SERIAL_KEYSPAN=m | 266 | CONFIG_USB_SERIAL_KEYSPAN=m |
267 | CONFIG_USB_SERIAL_KEYSPAN_MPR=y | ||
268 | CONFIG_USB_SERIAL_KEYSPAN_USA28=y | ||
269 | CONFIG_USB_SERIAL_KEYSPAN_USA28X=y | ||
270 | CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y | ||
271 | CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y | ||
272 | CONFIG_USB_SERIAL_KEYSPAN_USA19=y | ||
273 | CONFIG_USB_SERIAL_KEYSPAN_USA18X=y | ||
274 | CONFIG_USB_SERIAL_KEYSPAN_USA19W=y | ||
275 | CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y | ||
276 | CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y | ||
277 | CONFIG_USB_SERIAL_KEYSPAN_USA49W=y | ||
278 | CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | ||
279 | CONFIG_USB_APPLEDISPLAY=m | 267 | CONFIG_USB_APPLEDISPLAY=m |
280 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | 268 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y |
281 | CONFIG_EXT2_FS=y | 269 | CONFIG_EXT2_FS=y |
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index a8d5f2e4878d..716a3aa142ff 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig | |||
@@ -322,84 +322,6 @@ config USB_SERIAL_KEYSPAN | |||
322 | To compile this driver as a module, choose M here: the | 322 | To compile this driver as a module, choose M here: the |
323 | module will be called keyspan. | 323 | module will be called keyspan. |
324 | 324 | ||
325 | config USB_SERIAL_KEYSPAN_MPR | ||
326 | bool "USB Keyspan MPR Firmware" | ||
327 | depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL | ||
328 | help | ||
329 | Say Y here to include firmware for the Keyspan MPR converter. | ||
330 | |||
331 | config USB_SERIAL_KEYSPAN_USA28 | ||
332 | bool "USB Keyspan USA-28 Firmware" | ||
333 | depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL | ||
334 | help | ||
335 | Say Y here to include firmware for the USA-28 converter. | ||
336 | |||
337 | config USB_SERIAL_KEYSPAN_USA28X | ||
338 | bool "USB Keyspan USA-28X Firmware" | ||
339 | depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL | ||
340 | help | ||
341 | Say Y here to include firmware for the USA-28X converter. | ||
342 | Be sure you have a USA-28X, there are also 28XA and 28XB | ||
343 | models, the label underneath has the actual part number. | ||
344 | |||
345 | config USB_SERIAL_KEYSPAN_USA28XA | ||
346 | bool "USB Keyspan USA-28XA Firmware" | ||
347 | depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL | ||
348 | help | ||
349 | Say Y here to include firmware for the USA-28XA converter. | ||
350 | Be sure you have a USA-28XA, there are also 28X and 28XB | ||
351 | models, the label underneath has the actual part number. | ||
352 | |||
353 | config USB_SERIAL_KEYSPAN_USA28XB | ||
354 | bool "USB Keyspan USA-28XB Firmware" | ||
355 | depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL | ||
356 | help | ||
357 | Say Y here to include firmware for the USA-28XB converter. | ||
358 | Be sure you have a USA-28XB, there are also 28X and 28XA | ||
359 | models, the label underneath has the actual part number. | ||
360 | |||
361 | config USB_SERIAL_KEYSPAN_USA19 | ||
362 | bool "USB Keyspan USA-19 Firmware" | ||
363 | depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL | ||
364 | help | ||
365 | Say Y here to include firmware for the USA-19 converter. | ||
366 | |||
367 | config USB_SERIAL_KEYSPAN_USA18X | ||
368 | bool "USB Keyspan USA-18X Firmware" | ||
369 | depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL | ||
370 | help | ||
371 | Say Y here to include firmware for the USA-18X converter. | ||
372 | |||
373 | config USB_SERIAL_KEYSPAN_USA19W | ||
374 | bool "USB Keyspan USA-19W Firmware" | ||
375 | depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL | ||
376 | help | ||
377 | Say Y here to include firmware for the USA-19W converter. | ||
378 | |||
379 | config USB_SERIAL_KEYSPAN_USA19QW | ||
380 | bool "USB Keyspan USA-19QW Firmware" | ||
381 | depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL | ||
382 | help | ||
383 | Say Y here to include firmware for the USA-19QW converter. | ||
384 | |||
385 | config USB_SERIAL_KEYSPAN_USA19QI | ||
386 | bool "USB Keyspan USA-19QI Firmware" | ||
387 | depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL | ||
388 | help | ||
389 | Say Y here to include firmware for the USA-19QI converter. | ||
390 | |||
391 | config USB_SERIAL_KEYSPAN_USA49W | ||
392 | bool "USB Keyspan USA-49W Firmware" | ||
393 | depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL | ||
394 | help | ||
395 | Say Y here to include firmware for the USA-49W converter. | ||
396 | |||
397 | config USB_SERIAL_KEYSPAN_USA49WLC | ||
398 | bool "USB Keyspan USA-49WLC Firmware" | ||
399 | depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL | ||
400 | help | ||
401 | Say Y here to include firmware for the USA-49WLC converter. | ||
402 | |||
403 | config USB_SERIAL_KLSI | 325 | config USB_SERIAL_KLSI |
404 | tristate "USB KL5KUSB105 (Palmconnect) Driver" | 326 | tristate "USB KL5KUSB105 (Palmconnect) Driver" |
405 | ---help--- | 327 | ---help--- |