Skip to content

Commit 003948c

Browse files
bgilbertgregkh
bgilbert
authored and
gregkh
committed
USB: serial: keyspan: Drop firmware Kconfig options
The USB_SERIAL_KEYSPAN_* firmware options no longer do anything. Fixes: 5620a0d ("firmware: delete in-kernel firmware") Signed-off-by: Benjamin Gilbert <[email protected]> Cc: Johan Hovold <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 78fae52 commit 003948c

File tree

6 files changed

+0
-135
lines changed

6 files changed

+0
-135
lines changed

‎arch/mips/configs/rm200_defconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -325,15 +325,6 @@ CONFIG_USB_SERIAL_EDGEPORT=m
325325
CONFIG_USB_SERIAL_EDGEPORT_TI=m
326326
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
327327
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
337328
CONFIG_USB_SERIAL_KLSI=m
338329
CONFIG_USB_SERIAL_KOBIL_SCT=m
339330
CONFIG_USB_SERIAL_MCT_U232=m

‎arch/powerpc/configs/c2k_defconfig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -272,18 +272,6 @@ CONFIG_USB_SERIAL_EDGEPORT=m
272272
CONFIG_USB_SERIAL_EDGEPORT_TI=m
273273
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
274274
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
287275
CONFIG_USB_SERIAL_KLSI=m
288276
CONFIG_USB_SERIAL_KOBIL_SCT=m
289277
CONFIG_USB_SERIAL_MCT_U232=m

‎arch/powerpc/configs/g5_defconfig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -189,18 +189,6 @@ CONFIG_USB_SERIAL_GARMIN=m
189189
CONFIG_USB_SERIAL_IPW=m
190190
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
191191
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
204192
CONFIG_USB_SERIAL_KLSI=m
205193
CONFIG_USB_SERIAL_KOBIL_SCT=m
206194
CONFIG_USB_SERIAL_MCT_U232=m

‎arch/powerpc/configs/maple_defconfig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,6 @@ CONFIG_USB_SERIAL_CYPRESS_M8=m
8282
CONFIG_USB_SERIAL_GARMIN=m
8383
CONFIG_USB_SERIAL_IPW=m
8484
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
9785
CONFIG_USB_SERIAL_TI=m
9886
CONFIG_EXT2_FS=y
9987
CONFIG_EXT4_FS=y

‎arch/powerpc/configs/pmac32_defconfig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -264,18 +264,6 @@ CONFIG_USB_SERIAL_VISOR=m
264264
CONFIG_USB_SERIAL_IPAQ=m
265265
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
266266
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
279267
CONFIG_USB_APPLEDISPLAY=m
280268
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
281269
CONFIG_EXT2_FS=y

‎drivers/usb/serial/Kconfig

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -322,84 +322,6 @@ config USB_SERIAL_KEYSPAN
322322
To compile this driver as a module, choose M here: the
323323
module will be called keyspan.
324324

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-
403325
config USB_SERIAL_KLSI
404326
tristate "USB KL5KUSB105 (Palmconnect) Driver"
405327
---help---

0 commit comments

Comments
 (0)