[kernel] r9560 - in dists/trunk/linux-2.6/debian: . patches/debian/dfsg patches/series

[Bastian Blank]

Author: waldi
Date: Wed Sep 26 19:40:13 2007
New Revision: 9560

Log:
* debian/changelog: Update.
* debian/patches/debian/dfsg/files-1: Drop drivers/char/ip2.
* debian/patches/debian/dfsg/drivers-char-computone.patch: Add.
* debian/patches/series/orig-0: Update.


Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-char-computone.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
   dists/trunk/linux-2.6/debian/patches/series/orig-0

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Sep 26 19:40:13 2007
@@ -41,6 +41,7 @@
     - SMC ISA/MCA adapter support
     - EMI 6|2m USB Audio interface support
     - EMI 2|6 USB Audio interface support
+    - Computone IntelliPort Plus serial support
   * Remove binary only firmwares for:
     - Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support
     - Broadcom Tigon3 support

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-char-computone.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-char-computone.patch	Wed Sep 26 19:40:13 2007
@@ -0,0 +1,22 @@
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -100,15 +99,0 @@
+-config COMPUTONE
+-	tristate "Computone IntelliPort Plus serial support"
+-	depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
+-	---help---
+-	  This driver supports the entire family of Intelliport II/Plus
+-	  controllers with the exception of the MicroChannel controllers and
+-	  products previous to the Intelliport II. These are multiport cards,
+-	  which give you many serial ports. You would need something like this
+-	  to connect more than two modems to your Linux box, for instance in
+-	  order to become a dial-in server. If you have a card like that, say
+-	  Y here and read <file:Documentation/computone.txt>.
+-
+-	  To compile this driver as modules, choose M here: the
+-	  modules will be called ip2 and ip2main.
+-
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
+@@ -36 +35,0 @@
+-obj-$(CONFIG_COMPUTONE)		+= ip2/

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Wed Sep 26 19:40:13 2007
@@ -1,5 +1,7 @@
 rm Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
 
+rm drivers/char/ip2
+
 rm drivers/media/video/dabfirmware.h
 rm drivers/media/video/dabusb.c
 rm drivers/media/video/dabusb.h

Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0	Wed Sep 26 19:40:13 2007
@@ -1,3 +1,4 @@
++ debian/dfsg/drivers-char-computone.patch
 + debian/dfsg/drivers-media-video-dabus.patch
 + debian/dfsg/drivers-net-acenic-remove.patch
 + debian/dfsg/drivers-net-appletalk-cops.patch