[kernel] r12525 - in dists/etch/linux-2.6.24/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Wed Dec 24 21:15:16 2008
New Revision: 12525

Log:
Add PCI ids for P700m, P212, P410, P410i, P411, P812, P711m, p712m

Added:
   dists/etch/linux-2.6.24/debian/patches/bugfix/all/cciss-p711m,p712m-add-ids.patch   (contents, props changed)
      - copied, changed from r12519, /dists/etch/linux-2.6/debian/patches/bugfix/cciss-p711m,p712m-add-ids.patch
Modified:
   dists/etch/linux-2.6.24/debian/changelog
   dists/etch/linux-2.6.24/debian/patches/series/6~etchnhalf.8

Modified: dists/etch/linux-2.6.24/debian/changelog
==============================================================================
--- dists/etch/linux-2.6.24/debian/changelog	(original)
+++ dists/etch/linux-2.6.24/debian/changelog	Wed Dec 24 21:15:16 2008
@@ -2,7 +2,7 @@
 
   [ dann frazier ]
   * cciss: Add support for new hardware (closes: #502553)
-     - Add PCI ids for P212, P410, P410i, P411, P812
+     - Add PCI ids for P700m, P212, P410, P410i, P411, P812, P711m, p712m
      - Read the FIFO size from the controller config instead of
        hardcoding it into the driver
   * [hppa] disable UP-optimized flush_tlb_mm, fixing thread-related
@@ -11,7 +11,7 @@
   [ Martin Michlmayr ]
   * [arm/ixp4xx, arm/iop32x] Enable USB_ATM (closes: #502182).
 
- -- dann frazier <dannf at debian.org>  Wed, 24 Dec 2008 11:33:51 -0700
+ -- dann frazier <dannf at debian.org>  Wed, 24 Dec 2008 14:10:47 -0700
 
 linux-2.6.24 (2.6.24-6~etchnhalf.7) stable-security; urgency=high
 

Copied: dists/etch/linux-2.6.24/debian/patches/bugfix/all/cciss-p711m,p712m-add-ids.patch (from r12519, /dists/etch/linux-2.6/debian/patches/bugfix/cciss-p711m,p712m-add-ids.patch)
==============================================================================
--- /dists/etch/linux-2.6/debian/patches/bugfix/cciss-p711m,p712m-add-ids.patch	(original)
+++ dists/etch/linux-2.6.24/debian/patches/bugfix/all/cciss-p711m,p712m-add-ids.patch	Wed Dec 24 21:15:16 2008
@@ -11,24 +11,24 @@
     Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
     Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
 
-Adjusted to apply to Debian's 2.6.18 by dann frazier <dannf at debian.org>
-
-diff -urpN a/Documentation/cciss.txt b/Documentation/cciss.txt
---- a/Documentation/cciss.txt	2008-12-23 12:21:29.000000000 -0700
-+++ b/Documentation/cciss.txt	2008-12-23 12:22:54.000000000 -0700
-@@ -26,6 +26,8 @@ This driver is known to work with the fo
+diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt
+index 8244c64..48d80d9 100644
+--- a/Documentation/cciss.txt
++++ b/Documentation/cciss.txt
+@@ -26,6 +26,8 @@ This driver is known to work with the following cards:
  	* SA P410i
  	* SA P411
  	* SA P812
 +	* SA P712m
 +	* SA P711m
  
- If nodes are not already created in the /dev/cciss directory, run as root:
- 
-diff -urpN a/drivers/block/cciss.c b/drivers/block/cciss.c
---- a/drivers/block/cciss.c	2008-12-23 12:21:29.000000000 -0700
-+++ b/drivers/block/cciss.c	2008-12-23 12:22:54.000000000 -0700
-@@ -90,6 +90,8 @@ static const struct pci_device_id cciss_
+ Detecting drive failures:
+ -------------------------
+diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
+index 4023885..00048bd 100644
+--- a/drivers/block/cciss.c
++++ b/drivers/block/cciss.c
+@@ -96,6 +96,8 @@ static const struct pci_device_id cciss_pci_device_id[] = {
  	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3245},
  	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3247},
  	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3249},
@@ -37,7 +37,7 @@
  	{PCI_VENDOR_ID_HP,     PCI_ANY_ID,	PCI_ANY_ID, PCI_ANY_ID,
  		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
  	{0,}
-@@ -127,6 +129,8 @@ static struct board_type products[] = {
+@@ -133,6 +135,8 @@ static struct board_type products[] = {
  	{0x3245103C, "Smart Array P410i", &SA5_access},
  	{0x3247103C, "Smart Array P411", &SA5_access},
  	{0x3249103C, "Smart Array P812", &SA5_access},

Modified: dists/etch/linux-2.6.24/debian/patches/series/6~etchnhalf.8
==============================================================================
--- dists/etch/linux-2.6.24/debian/patches/series/6~etchnhalf.8	(original)
+++ dists/etch/linux-2.6.24/debian/patches/series/6~etchnhalf.8	Wed Dec 24 21:15:16 2008
@@ -1,3 +1,4 @@
 + bugfix/cciss-new-hardware.patch
 + bugfix/cciss-read-config-to-obtain-max-outstanding-commands-per-controller.patch
 + bugfix/hppa/parisc-disable-up-optimized-flush_tlb_mm.patch
++ bugfix/all/cciss-p711m,p712m-add-ids.patch