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

[Maximilian Attems]

Author: maks
Date: Fri Jun 13 09:51:37 2008
New Revision: 11628

Log:
fix orig tarball generation ip2 only nuke firmware

don't be overgreedy nuking all dir and creating useless conflicts thus
as next step is to port in request_firmware() patch


Modified:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-char-computone.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-char-computone.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-char-computone.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-char-computone.patch	Fri Jun 13 09:51:37 2008
@@ -1,3 +1,5 @@
+mark ip2 broken due to not using request_firmware()
+
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
 index 2d854bb..7d3f39e 100644
 --- a/drivers/char/Kconfig
@@ -10,7 +12,3 @@
  	depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
  	---help---
  	  This driver supports the entire family of Intelliport II/Plus
---- 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	Fri Jun 13 09:51:37 2008
@@ -9,7 +9,7 @@
 rm drivers/atm/pca200e_ecd.data
 rm drivers/atm/sba200e_ecd.data
 
-rm drivers/char/ip2
+rm drivers/char/ip2/fip_firm.h
 
 rm drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h