From d8ec7443551015dad76229f38be7cd8283635986 Mon Sep 17 00:00:00 2001 From: Justin Chen Date: Mon, 24 Oct 2005 22:16:38 +0100 Subject: [PATCH] --- yaml --- r: 10109 b: refs/heads/master c: 551f8f0e87becb415c522adccab524a7a05ca83a h: refs/heads/master i: 10107: 98a85a05386be2ba0a487266abc4aac30e13889f v: v3 --- [refs] | 2 +- trunk/drivers/serial/8250_pci.c | 1 + trunk/include/linux/pci_ids.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index da9e31478521..ff22dcc2c3f2 100644 --- 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 index 5da61ebbac88..5c3c03932d6d 100644 --- 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 index ca0691c319ab..71834f05504f 100644 --- 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