diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-06 16:33:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-06 16:33:24 -0700 |
| commit | acba4c1b1770b694f1c16b35a4fb6c884d4fc320 (patch) | |
| tree | 0b9c4fe911346f35ca0f0296b1d3de214ae5b1fe /usb | |
| parent | b2267928115c563206ff006eb83e7935b7565eec (diff) | |
| download | patches-acba4c1b1770b694f1c16b35a4fb6c884d4fc320.tar.gz | |
fix option config mess
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-new-devices-for-the-option-driver.patch | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/usb/usb-new-devices-for-the-option-driver.patch b/usb/usb-new-devices-for-the-option-driver.patch index dd6e2f011613c..4038d2b15df7a 100644 --- a/usb/usb-new-devices-for-the-option-driver.patch +++ b/usb/usb-new-devices-for-the-option-driver.patch @@ -15,13 +15,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/usb/serial/Kconfig | 28 +++++++-- + drivers/usb/serial/Kconfig | 16 +++-- drivers/usb/serial/option.c | 136 ++++++++++++++++++++++++++++++++++---------- - 2 files changed, 130 insertions(+), 34 deletions(-) + 2 files changed, 118 insertions(+), 34 deletions(-) --- gregkh-2.6.orig/drivers/usb/serial/Kconfig +++ gregkh-2.6/drivers/usb/serial/Kconfig -@@ -491,12 +491,30 @@ config USB_SERIAL_XIRCOM +@@ -491,16 +491,22 @@ config USB_SERIAL_XIRCOM module will be called keyspan_pda. config USB_SERIAL_OPTION @@ -33,21 +33,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - Say Y here if you want to use an Option card. This is a - GSM card, controlled by three serial ports which are connected - via an OHCI adapter located on a PC card. -+ Say Y here if you have a GSM modem that's connected to USB. -+ -+ To compile this driver as a module, choose M here: the -+ module will be called option. -+ -+ If this driver doesn't recognize your device, -+ it might be accessible via the FTDI_SIO driver. -+ -+config USB_SERIAL_OPTION_PCCARD -+ tristate "driver for GSM modems on PCMCIA cards" -+ depends on USB_SERIAL -+ select PCCARD -+ select USB_OHCI_HCD -+ select USB_SERIAL_OPTION -+ help + Say Y here if you have an "Option" GSM PCMCIA card + (or an OEM version: branded Huawei, Audiovox, or Novatel). + @@ -57,6 +42,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> To compile this driver as a module, choose M here: the module will be called option. + ++ If this driver doesn't recognize your device, ++ it might be accessible via the FTDI_SIO driver. ++ + config USB_SERIAL_OMNINET + tristate "USB ZyXEL omni.net LCD Plus Driver (EXPERIMENTAL)" + depends on USB_SERIAL && EXPERIMENTAL --- gregkh-2.6.orig/drivers/usb/serial/option.c +++ gregkh-2.6/drivers/usb/serial/option.c @@ -1,5 +1,5 @@ |