diff options
author | Luís P Mendes <luis.p.mendes@gmail.com> | 2008-02-06 04:37:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 13:41:08 -0500 |
commit | dc999159bbc1c542f310160c56ed8b701a7d6252 (patch) | |
tree | 79f8ad0ef400345953cfbe3699aec6b47bd23bf3 | |
parent | a8e3eff4668e3a4d6dbe7985a780f91de38a3c71 (diff) |
parport: add support for the Quatech SPPXP-100 Parallel port PCI ExpressCard
Added pci device id for the Quatech SPPXP-100 ExpressCard - 0x278 - to
include/linux/pci_id.h
Modified drivers/parport/parport_pc.c to support the Quatech SPPXP-100 Parallel port PCI ExpressCard
[akpm@linux-foundation.org: build fix]
Signed-off-by: Luís P Mendes <luis.p.mendes@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/parport/parport_pc.c | 5 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index e9743d3efaf6..db26b4017bc1 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c | |||
@@ -2767,6 +2767,7 @@ enum parport_pc_pci_cards { | |||
2767 | netmos_9755, | 2767 | netmos_9755, |
2768 | netmos_9805, | 2768 | netmos_9805, |
2769 | netmos_9815, | 2769 | netmos_9815, |
2770 | quatech_sppxp100, | ||
2770 | }; | 2771 | }; |
2771 | 2772 | ||
2772 | 2773 | ||
@@ -2843,6 +2844,7 @@ static struct parport_pc_pci { | |||
2843 | /* netmos_9755 */ { 2, { { 0, 1 }, { 2, 3 },} }, /* untested */ | 2844 | /* netmos_9755 */ { 2, { { 0, 1 }, { 2, 3 },} }, /* untested */ |
2844 | /* netmos_9805 */ { 1, { { 0, -1 }, } }, /* untested */ | 2845 | /* netmos_9805 */ { 1, { { 0, -1 }, } }, /* untested */ |
2845 | /* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ | 2846 | /* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ |
2847 | /* quatech_sppxp100 */ { 1, { { 0, 1 }, } }, | ||
2846 | }; | 2848 | }; |
2847 | 2849 | ||
2848 | static const struct pci_device_id parport_pc_pci_tbl[] = { | 2850 | static const struct pci_device_id parport_pc_pci_tbl[] = { |
@@ -2926,6 +2928,9 @@ static const struct pci_device_id parport_pc_pci_tbl[] = { | |||
2926 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9805 }, | 2928 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9805 }, |
2927 | { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9815, | 2929 | { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9815, |
2928 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 }, | 2930 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 }, |
2931 | /* Quatech SPPXP-100 Parallel port PCI ExpressCard */ | ||
2932 | { PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_SPPXP_100, | ||
2933 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, quatech_sppxp100 }, | ||
2929 | { 0, } /* terminate list */ | 2934 | { 0, } /* terminate list */ |
2930 | }; | 2935 | }; |
2931 | MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl); | 2936 | MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl); |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 39d32837265b..df6dd79a0d3b 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -1765,6 +1765,7 @@ | |||
1765 | #define PCI_DEVICE_ID_QUATECH_DSC100 0x0020 | 1765 | #define PCI_DEVICE_ID_QUATECH_DSC100 0x0020 |
1766 | #define PCI_DEVICE_ID_QUATECH_ESC100D 0x0050 | 1766 | #define PCI_DEVICE_ID_QUATECH_ESC100D 0x0050 |
1767 | #define PCI_DEVICE_ID_QUATECH_ESC100M 0x0060 | 1767 | #define PCI_DEVICE_ID_QUATECH_ESC100M 0x0060 |
1768 | #define PCI_DEVICE_ID_QUATECH_SPPXP_100 0x0278 | ||
1768 | 1769 | ||
1769 | #define PCI_VENDOR_ID_SEALEVEL 0x135e | 1770 | #define PCI_VENDOR_ID_SEALEVEL 0x135e |
1770 | #define PCI_DEVICE_ID_SEALEVEL_U530 0x7101 | 1771 | #define PCI_DEVICE_ID_SEALEVEL_U530 0x7101 |