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

[Bastian Blank]

Author: waldi
Date: Wed Sep 26 19:54:44 2007
New Revision: 9564

Log:
* debian/changelog: Update.
* debian/patches/debian/dfsg/files-1: Drop file.
* debian/patches/debian/dfsg/drivers-scsi-qlogicpti.patch: Add.
* debian/patches/series/orig-0: Update.


Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-scsi-qlogicpti.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:54:44 2007
@@ -52,6 +52,7 @@
     - Technotrend/Hauppauge Nova-USB devices
     - YAM driver for AX.25
     - MyriCOM Gigabit Ethernet support
+    - PTI Qlogic, ISP Driver
   * Disable now broken drivers:
     - Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support
     - Broadcom Tigon3 support
@@ -59,6 +60,7 @@
     - Technotrend/Hauppauge Nova-USB devices
     - YAM driver for AX.25
     - MyriCOM Gigabit Ethernet support
+    - PTI Qlogic, ISP Driver
   * Add -common to common header package names.
   * Drop provides from common header packages.
 

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-scsi-qlogicpti.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-scsi-qlogicpti.patch	Wed Sep 26 19:54:44 2007
@@ -0,0 +1,8 @@
+diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
+index 6f2c71e..53c9aca 100644
+--- a/drivers/scsi/Kconfig
++++ b/drivers/scsi/Kconfig
+@@ -1306,2 +1306,3 @@ config SCSI_QLOGICPTI
+ 	tristate "PTI Qlogic, ISP Driver"
++	depends on BROKEN
+ 	depends on SBUS && SCSI

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:54:44 2007
@@ -40,6 +40,8 @@
 rm drivers/net/tokenring/smctr.h
 rm drivers/net/tokenring/smctr_firmware.h
 
+rm drivers/scsi/qlogicpti_asm.c
+
 rm drivers/usb/misc/emi26.c
 rm drivers/usb/misc/emi26_fw.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:54:44 2007
@@ -8,6 +8,7 @@
 + debian/dfsg/drivers-net-myri.patch
 + debian/dfsg/drivers-net-tg3-remove.patch
 + debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
++ debian/dfsg/drivers-scsi-qlogicpti.patch
 + debian/dfsg/drivers-usb-misc-emi62-emi26.patch
 + debian/dfsg/drivers-usb-serial-keyspan-remove.patch
 + debian/dfsg/sound-pci.patch