aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/configs/rm200_defconfig9
-rw-r--r--arch/powerpc/configs/c2k_defconfig12
-rw-r--r--arch/powerpc/configs/g5_defconfig12
-rw-r--r--arch/powerpc/configs/maple_defconfig12
-rw-r--r--arch/powerpc/configs/pmac32_defconfig12
-rw-r--r--drivers/usb/serial/Kconfig78
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
325CONFIG_USB_SERIAL_EDGEPORT_TI=m 325CONFIG_USB_SERIAL_EDGEPORT_TI=m
326CONFIG_USB_SERIAL_KEYSPAN_PDA=m 326CONFIG_USB_SERIAL_KEYSPAN_PDA=m
327CONFIG_USB_SERIAL_KEYSPAN=m 327CONFIG_USB_SERIAL_KEYSPAN=m
328CONFIG_USB_SERIAL_KEYSPAN_MPR=y
329CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
330CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
331CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
332CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
333CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
334CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
335CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
336CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
337CONFIG_USB_SERIAL_KLSI=m 328CONFIG_USB_SERIAL_KLSI=m
338CONFIG_USB_SERIAL_KOBIL_SCT=m 329CONFIG_USB_SERIAL_KOBIL_SCT=m
339CONFIG_USB_SERIAL_MCT_U232=m 330CONFIG_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
272CONFIG_USB_SERIAL_EDGEPORT_TI=m 272CONFIG_USB_SERIAL_EDGEPORT_TI=m
273CONFIG_USB_SERIAL_KEYSPAN_PDA=m 273CONFIG_USB_SERIAL_KEYSPAN_PDA=m
274CONFIG_USB_SERIAL_KEYSPAN=m 274CONFIG_USB_SERIAL_KEYSPAN=m
275CONFIG_USB_SERIAL_KEYSPAN_MPR=y
276CONFIG_USB_SERIAL_KEYSPAN_USA28=y
277CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
278CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
279CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
280CONFIG_USB_SERIAL_KEYSPAN_USA19=y
281CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
282CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
283CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
284CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
285CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
286CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
287CONFIG_USB_SERIAL_KLSI=m 275CONFIG_USB_SERIAL_KLSI=m
288CONFIG_USB_SERIAL_KOBIL_SCT=m 276CONFIG_USB_SERIAL_KOBIL_SCT=m
289CONFIG_USB_SERIAL_MCT_U232=m 277CONFIG_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
189CONFIG_USB_SERIAL_IPW=m 189CONFIG_USB_SERIAL_IPW=m
190CONFIG_USB_SERIAL_KEYSPAN_PDA=m 190CONFIG_USB_SERIAL_KEYSPAN_PDA=m
191CONFIG_USB_SERIAL_KEYSPAN=m 191CONFIG_USB_SERIAL_KEYSPAN=m
192CONFIG_USB_SERIAL_KEYSPAN_MPR=y
193CONFIG_USB_SERIAL_KEYSPAN_USA28=y
194CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
195CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
196CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
197CONFIG_USB_SERIAL_KEYSPAN_USA19=y
198CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
199CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
200CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
201CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
202CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
203CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
204CONFIG_USB_SERIAL_KLSI=m 192CONFIG_USB_SERIAL_KLSI=m
205CONFIG_USB_SERIAL_KOBIL_SCT=m 193CONFIG_USB_SERIAL_KOBIL_SCT=m
206CONFIG_USB_SERIAL_MCT_U232=m 194CONFIG_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
82CONFIG_USB_SERIAL_GARMIN=m 82CONFIG_USB_SERIAL_GARMIN=m
83CONFIG_USB_SERIAL_IPW=m 83CONFIG_USB_SERIAL_IPW=m
84CONFIG_USB_SERIAL_KEYSPAN=y 84CONFIG_USB_SERIAL_KEYSPAN=y
85CONFIG_USB_SERIAL_KEYSPAN_MPR=y
86CONFIG_USB_SERIAL_KEYSPAN_USA28=y
87CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
88CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
89CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
90CONFIG_USB_SERIAL_KEYSPAN_USA19=y
91CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
92CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
93CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
94CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
95CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
96CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
97CONFIG_USB_SERIAL_TI=m 85CONFIG_USB_SERIAL_TI=m
98CONFIG_EXT2_FS=y 86CONFIG_EXT2_FS=y
99CONFIG_EXT4_FS=y 87CONFIG_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
264CONFIG_USB_SERIAL_IPAQ=m 264CONFIG_USB_SERIAL_IPAQ=m
265CONFIG_USB_SERIAL_KEYSPAN_PDA=m 265CONFIG_USB_SERIAL_KEYSPAN_PDA=m
266CONFIG_USB_SERIAL_KEYSPAN=m 266CONFIG_USB_SERIAL_KEYSPAN=m
267CONFIG_USB_SERIAL_KEYSPAN_MPR=y
268CONFIG_USB_SERIAL_KEYSPAN_USA28=y
269CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
270CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
271CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
272CONFIG_USB_SERIAL_KEYSPAN_USA19=y
273CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
274CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
275CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
276CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
277CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
278CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
279CONFIG_USB_APPLEDISPLAY=m 267CONFIG_USB_APPLEDISPLAY=m
280CONFIG_LEDS_TRIGGER_DEFAULT_ON=y 268CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
281CONFIG_EXT2_FS=y 269CONFIG_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
325config 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
331config 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
337config 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
345config 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
353config 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
361config 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
367config 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
373config 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
379config 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
385config 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
391config 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
397config 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
403config USB_SERIAL_KLSI 325config USB_SERIAL_KLSI
404 tristate "USB KL5KUSB105 (Palmconnect) Driver" 326 tristate "USB KL5KUSB105 (Palmconnect) Driver"
405 ---help--- 327 ---help---