---

yaml --- r: 10109 b: refs/heads/master c: 551f8f0 h: refs/heads/master i: 10107: 98a85a0 v: v3
git-mirror · Oct 24, 2005 · d8ec744 · d8ec744
1 parent cb41199
commit d8ec744
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: add7b58e7558dd2894f3c17ca8574099fcba5c15
+refs/heads/master: 551f8f0e87becb415c522adccab524a7a05ca83a
diff --git a/trunk/drivers/serial/8250_pci.c b/trunk/drivers/serial/8250_pci.c
@@ -152,6 +152,7 @@ static int __devinit pci_hp_diva_init(struct pci_dev *dev)
 		rc = 4;
 		break;
 	case PCI_DEVICE_ID_HP_DIVA_POWERBAR:
+	case PCI_DEVICE_ID_HP_DIVA_HURRICANE:
 		rc = 1;
 		break;
 	}

diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h
@@ -723,6 +723,7 @@
 #define PCI_DEVICE_ID_HP_DIVA_EVEREST	0x1282
 #define PCI_DEVICE_ID_HP_DIVA_AUX	0x1290
 #define PCI_DEVICE_ID_HP_DIVA_RMP3	0x1301
+#define PCI_DEVICE_ID_HP_DIVA_HURRICANE	0x132a
 #define PCI_DEVICE_ID_HP_CISS		0x3210
 #define PCI_DEVICE_ID_HP_CISSA		0x3220
 #define PCI_DEVICE_ID_HP_CISSB		0x3222
-Original file line number
+Diff line change
@@ Expand Up / @@ -152,6 +152,7 @@ static int __devinit pci_hp_diva_init(struct pci_dev *dev) @@
     		rc = 4;
     		break;
     	case PCI_DEVICE_ID_HP_DIVA_POWERBAR:
+    	case PCI_DEVICE_ID_HP_DIVA_HURRICANE:
     		rc = 1;
     		break;
     	}
@@ Expand Down @@