]> CyberLeo.Net >> Repos - FreeBSD/stable/9.git/commit
Merge r232639
authorremko <remko@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 12 Dec 2012 07:19:14 +0000 (07:19 +0000)
committerremko <remko@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 12 Dec 2012 07:19:14 +0000 (07:19 +0000)
commit722a63e0f34c110ccc975e6428afb34e40955c5c
treeb3906ec10268d228585cdcd1f8f171f9dfe1b802
parent6035adc99860690b536ea7faa795e55e5fa23d2d
Merge r232639

Original commit:

Add support for the MosChip MCS9904 four serial ports
controller.

PR:  165804
Submitted by: Eugene Grosbein
MFC after: 1 week

Modified:
head/sys/dev/uart/uart_bus_pci.c

Modified: head/sys/dev/uart/uart_bus_pci.c
==============================================================================
--- head/sys/dev/uart/uart_bus_pci.c Wed Mar 7 06:25:17 2012 (r232638)
+++ head/sys/dev/uart/uart_bus_pci.c Wed Mar 7 06:42:21 2012 (r232639)
@@ -126,6 +126,8 @@ static struct pci_id pci_ns8250_ids[] =
"MosChip MCS9900 PCIe to Peripheral Controller", 0x10 },
{ 0x9710, 0x9901, 0xa000, 0x1000,
"MosChip MCS9901 PCIe to Peripheral Controller", 0x10 },
+{ 0x9710, 0x9904, 0xa000, 0x1000,
+ "MosChip MCS9904 PCIe to Peripheral Controller", 0x10 },
{ 0xdeaf, 0x9051, 0xffff, 0, "Middle Digital PC Weasel Serial Port", 0x10 },
{ 0xffff, 0, 0xffff, 0, NULL, 0, 0}
};

git-svn-id: svn://svn.freebsd.org/base/stable/9@244139 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sys/dev/uart/uart_bus_pci.c