---

yaml --- r: 29797 b: refs/heads/master c: f82ccdb h: refs/heads/master i: 29795: f6d3135 v: v3
git-mirror · Jun 25, 2006 · 93d8770 · 93d8770
1 parent 03fb875
commit 93d8770
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 37 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c8328355609be6d229e1a5e016a0115e9328b83
+refs/heads/master: f82ccdb992d694f46b28f0478f62468260f45607
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
@@ -64,42 +64,24 @@ MODULE_LICENSE("GPL");
 
 /* define the PCI info for the cards we can control */
 static const struct pci_device_id cciss_pci_device_id[] = {
-	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISS,
-	 0x0E11, 0x4070, 0, 0, 0},
-	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB,
-	 0x0E11, 0x4080, 0, 0, 0},
-	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB,
-	 0x0E11, 0x4082, 0, 0, 0},
-	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB,
-	 0x0E11, 0x4083, 0, 0, 0},
-	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
-	 0x0E11, 0x409A, 0, 0, 0},
-	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
-	 0x0E11, 0x409B, 0, 0, 0},
-	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
-	 0x0E11, 0x409C, 0, 0, 0},
-	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
-	 0x0E11, 0x409D, 0, 0, 0},
-	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
-	 0x0E11, 0x4091, 0, 0, 0},
-	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSA,
-	 0x103C, 0x3225, 0, 0, 0},
-	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC,
-	 0x103c, 0x3223, 0, 0, 0},
-	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC,
-	 0x103c, 0x3234, 0, 0, 0},
-	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC,
-	 0x103c, 0x3235, 0, 0, 0},
-	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,
-	 0x103c, 0x3211, 0, 0, 0},
-	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,
-	 0x103c, 0x3212, 0, 0, 0},
-	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,
-	 0x103c, 0x3213, 0, 0, 0},
-	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,
-	 0x103c, 0x3214, 0, 0, 0},
-	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,
-	 0x103c, 0x3215, 0, 0, 0},
+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISS,  0x0E11, 0x4070},
+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB, 0x0E11, 0x4080},
+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB, 0x0E11, 0x4082},
+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB, 0x0E11, 0x4083},
+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, 0x0E11, 0x4091},
+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, 0x0E11, 0x409A},
+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, 0x0E11, 0x409B},
+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, 0x0E11, 0x409C},
+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, 0x0E11, 0x409D},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSA,     0x103C, 0x3225},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3223},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3234},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3235},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3211},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3212},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3213},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3214},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3215},
 	{0,}
 };