diff --git a/[refs] b/[refs] index 21ce94683236..9dc39d4d1633 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63b917678fe6d63e633462b5be5a309511bcf3ca +refs/heads/master: 9ff68c7ad8910426495be36e2b568ac623adc226 diff --git a/trunk/drivers/usb/serial/Kconfig b/trunk/drivers/usb/serial/Kconfig index a0b2247eeaa1..bd8aab0ef1cf 100644 --- a/trunk/drivers/usb/serial/Kconfig +++ b/trunk/drivers/usb/serial/Kconfig @@ -425,16 +425,15 @@ config USB_SERIAL_MOS7720 To compile this driver as a module, choose M here: the module will be called mos7720. -if USB_SERIAL_MOS7720 config USB_SERIAL_MOS7715_PARPORT bool "Support for parallel port on the Moschip 7715" + depends on USB_SERIAL_MOS7720 + depends on PARPORT=y || PARPORT=USB_SERIAL_MOS7720 select PARPORT_NOT_PC - depends on PARPORT ---help--- Say Y if you have a Moschip 7715 device and would like to use the parallel port it provides. The port will register with the parport subsystem as a low-level driver. -endif config USB_SERIAL_MOS7840 tristate "USB Moschip 7840/7820 USB Serial Driver"