summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Chen <justin.chen@hp.com>2005-10-24 22:16:38 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-10-24 22:16:38 +0100
commit551f8f0e87becb415c522adccab524a7a05ca83a (patch)
tree90b0cc25cb78c1d062e16e7bf4c049b4556e69eb
parentadd7b58e7558dd2894f3c17ca8574099fcba5c15 (diff)
downloadkernel-crypto-551f8f0e87becb415c522adccab524a7a05ca83a.tar.gz
kernel-crypto-551f8f0e87becb415c522adccab524a7a05ca83a.tar.xz
kernel-crypto-551f8f0e87becb415c522adccab524a7a05ca83a.zip
[SERIAL] new hp diva console port
Add the new ID 0x132a and configure the new PCI Diva console port. This device supports only 1 single console UART. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/serial/8250_pci.c1
-rw-r--r--include/linux/pci_ids.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 5da61ebbac8..5c3c03932d6 100644
--- a/drivers/serial/8250_pci.c
+++ b/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/include/linux/pci_ids.h b/include/linux/pci_ids.h
index ca0691c319a..71834f05504 100644
--- a/include/linux/pci_ids.h
+++ b/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