From 7c55d5a06acfbfcfe38e6a276a46066fa7daa94a Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 3 May 2010 10:07:25 -0700 Subject: [PATCH] --- yaml --- r: 195405 b: refs/heads/master c: 9ff68c7ad8910426495be36e2b568ac623adc226 h: refs/heads/master i: 195403: c5d474f1549b7ba39b7b56dc3b58dfc960818b85 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/Kconfig | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) 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"