[kernel] r9522 - dists/trunk/linux-2.6/debian/patches/debian/dfsg

[Bastian Blank]

Author: waldi
Date: Sat Sep 15 18:47:11 2007
New Revision: 9522

Log:
debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch:
Only disable the keyspan entry, the source is not removed.


Modified:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-usb-serial-keyspan.patch	Sat Sep 15 18:47:11 2007
@@ -1,24 +1,19 @@
-diff -ruN a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
---- a/drivers/usb/serial/Kconfig	2007-02-04 19:44:54.000000000 +0100
-+++ b/drivers/usb/serial/Kconfig	2007-02-05 16:37:51.000000000 +0100
-@@ -283,98 +283,6 @@
+diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
+index 43d6db6..61c13e3 100644
+--- a/drivers/usb/serial/Kconfig
++++ b/drivers/usb/serial/Kconfig
+@@ -285,6 +285,7 @@ config USB_SERIAL_KEYSPAN_PDA
+ 
+ config USB_SERIAL_KEYSPAN
+ 	tristate "USB Keyspan USA-xxx Serial Driver"
++	depends on BROKEN
+ 	depends on USB_SERIAL
+ 	---help---
+ 	  Say Y here if you want to use Keyspan USB to serial converter
+@@ -297,84 +298,6 @@ config USB_SERIAL_KEYSPAN
  	  To compile this driver as a module, choose M here: the
- 	  module will be called keyspan_pda.
+ 	  module will be called keyspan.
  
--config USB_SERIAL_KEYSPAN
--	tristate "USB Keyspan USA-xxx Serial Driver"
--	depends on USB_SERIAL
--	---help---
--	  Say Y here if you want to use Keyspan USB to serial converter
--	  devices.  This driver makes use of Keyspan's official firmware
--	  and was developed with their support.  You must also include
--	  firmware to support your particular device(s).
--
--	  See <http://misc.nu/hugh/keyspan.html> for more information.
--
--	  To compile this driver as a module, choose M here: the
--	  module will be called keyspan.
--
 -config USB_SERIAL_KEYSPAN_MPR
 -	bool "USB Keyspan MPR Firmware"
 -	depends on USB_SERIAL_KEYSPAN
@@ -100,14 +95,3 @@
  config USB_SERIAL_KLSI
  	tristate "USB KL5KUSB105 (Palmconnect) Driver (EXPERIMENTAL)"
  	depends on USB_SERIAL && EXPERIMENTAL
-diff -ruN a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
---- a/drivers/usb/serial/Makefile	2007-02-04 19:44:54.000000000 +0100
-+++ b/drivers/usb/serial/Makefile	2007-02-05 16:37:51.000000000 +0100
-@@ -30,7 +30,6 @@
- obj-$(CONFIG_USB_SERIAL_IPAQ)			+= ipaq.o
- obj-$(CONFIG_USB_SERIAL_IPW)			+= ipw.o
- obj-$(CONFIG_USB_SERIAL_IR)			+= ir-usb.o
--obj-$(CONFIG_USB_SERIAL_KEYSPAN)		+= keyspan.o
- obj-$(CONFIG_USB_SERIAL_KEYSPAN_PDA)		+= keyspan_pda.o
- obj-$(CONFIG_USB_SERIAL_KLSI)			+= kl5kusb105.o
- obj-$(CONFIG_USB_SERIAL_KOBIL_SCT)		+= kobil_sct.o