diff options
-rw-r--r-- | drivers/isdn/hardware/mISDN/hfcmulti.c | 3 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c index 5be4edf631d9..50e9f4d88f48 100644 --- a/drivers/isdn/hardware/mISDN/hfcmulti.c +++ b/drivers/isdn/hardware/mISDN/hfcmulti.c | |||
@@ -5275,6 +5275,7 @@ static const struct hm_map hfcm_map[] = { | |||
5275 | /*30*/ {VENDOR_CCD, "HFC-8S OpenVox", 8, 8, 1, 0, 0, 0, 0, 0}, | 5275 | /*30*/ {VENDOR_CCD, "HFC-8S OpenVox", 8, 8, 1, 0, 0, 0, 0, 0}, |
5276 | /*31*/ {VENDOR_CCD, "XHFC-4S Speech Design", 5, 4, 0, 0, 0, 0, | 5276 | /*31*/ {VENDOR_CCD, "XHFC-4S Speech Design", 5, 4, 0, 0, 0, 0, |
5277 | HFC_IO_MODE_EMBSD, XHFC_IRQ}, | 5277 | HFC_IO_MODE_EMBSD, XHFC_IRQ}, |
5278 | /*32*/ {VENDOR_JH, "HFC-8S (junghanns)", 8, 8, 1, 0, 0, 0, 0, 0}, | ||
5278 | }; | 5279 | }; |
5279 | 5280 | ||
5280 | #undef H | 5281 | #undef H |
@@ -5328,6 +5329,8 @@ static struct pci_device_id hfmultipci_ids[] __devinitdata = { | |||
5328 | PCI_SUBDEVICE_ID_CCD_HFC8S, 0, 0, H(18)}, /* 8S */ | 5329 | PCI_SUBDEVICE_ID_CCD_HFC8S, 0, 0, H(18)}, /* 8S */ |
5329 | { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC8S, PCI_VENDOR_ID_CCD, | 5330 | { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC8S, PCI_VENDOR_ID_CCD, |
5330 | PCI_SUBDEVICE_ID_CCD_OV8S, 0, 0, H(30)}, /* OpenVox 8 */ | 5331 | PCI_SUBDEVICE_ID_CCD_OV8S, 0, 0, H(30)}, /* OpenVox 8 */ |
5332 | { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC8S, PCI_VENDOR_ID_CCD, | ||
5333 | PCI_SUBDEVICE_ID_CCD_JH8S, 0, 0, H(32)}, /* Junganns 8S */ | ||
5331 | 5334 | ||
5332 | 5335 | ||
5333 | /* Cards with HFC-E1 Chip */ | 5336 | /* Cards with HFC-E1 Chip */ |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 3038ac25491f..4bdff984ac99 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -1914,6 +1914,7 @@ | |||
1914 | #define PCI_SUBDEVICE_ID_CCD_SWYX4S 0xB540 | 1914 | #define PCI_SUBDEVICE_ID_CCD_SWYX4S 0xB540 |
1915 | #define PCI_SUBDEVICE_ID_CCD_JH4S20 0xB550 | 1915 | #define PCI_SUBDEVICE_ID_CCD_JH4S20 0xB550 |
1916 | #define PCI_SUBDEVICE_ID_CCD_IOB8ST_1 0xB552 | 1916 | #define PCI_SUBDEVICE_ID_CCD_IOB8ST_1 0xB552 |
1917 | #define PCI_SUBDEVICE_ID_CCD_JH8S 0xB55B | ||
1917 | #define PCI_SUBDEVICE_ID_CCD_BN4S 0xB560 | 1918 | #define PCI_SUBDEVICE_ID_CCD_BN4S 0xB560 |
1918 | #define PCI_SUBDEVICE_ID_CCD_BN8S 0xB562 | 1919 | #define PCI_SUBDEVICE_ID_CCD_BN8S 0xB562 |
1919 | #define PCI_SUBDEVICE_ID_CCD_BNE1 0xB563 | 1920 | #define PCI_SUBDEVICE_ID_CCD_BNE1 0xB563 |