diff options
Diffstat (limited to 'drivers/parport')
-rw-r--r-- | drivers/parport/parport_pc.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index 8a846adf1dcf..96f3bdf0ec4b 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c | |||
@@ -2791,6 +2791,7 @@ enum parport_pc_pci_cards { | |||
2791 | oxsemi_952, | 2791 | oxsemi_952, |
2792 | oxsemi_954, | 2792 | oxsemi_954, |
2793 | oxsemi_840, | 2793 | oxsemi_840, |
2794 | oxsemi_pcie_pport, | ||
2794 | aks_0100, | 2795 | aks_0100, |
2795 | mobility_pp, | 2796 | mobility_pp, |
2796 | netmos_9705, | 2797 | netmos_9705, |
@@ -2868,6 +2869,7 @@ static struct parport_pc_pci { | |||
2868 | /* oxsemi_952 */ { 1, { { 0, 1 }, } }, | 2869 | /* oxsemi_952 */ { 1, { { 0, 1 }, } }, |
2869 | /* oxsemi_954 */ { 1, { { 0, -1 }, } }, | 2870 | /* oxsemi_954 */ { 1, { { 0, -1 }, } }, |
2870 | /* oxsemi_840 */ { 1, { { 0, 1 }, } }, | 2871 | /* oxsemi_840 */ { 1, { { 0, 1 }, } }, |
2872 | /* oxsemi_pcie_pport */ { 1, { { 0, 1 }, } }, | ||
2871 | /* aks_0100 */ { 1, { { 0, -1 }, } }, | 2873 | /* aks_0100 */ { 1, { { 0, -1 }, } }, |
2872 | /* mobility_pp */ { 1, { { 0, 1 }, } }, | 2874 | /* mobility_pp */ { 1, { { 0, 1 }, } }, |
2873 | /* netmos_9705 */ { 1, { { 0, -1 }, } }, /* untested */ | 2875 | /* netmos_9705 */ { 1, { { 0, -1 }, } }, /* untested */ |
@@ -2928,7 +2930,6 @@ static const struct pci_device_id parport_pc_pci_tbl[] = { | |||
2928 | { 0x1409, 0x7268, 0x1409, 0x0103, 0, 0, timedia_4008a }, | 2930 | { 0x1409, 0x7268, 0x1409, 0x0103, 0, 0, timedia_4008a }, |
2929 | { 0x1409, 0x7268, 0x1409, 0x0104, 0, 0, timedia_4018 }, | 2931 | { 0x1409, 0x7268, 0x1409, 0x0104, 0, 0, timedia_4018 }, |
2930 | { 0x1409, 0x7268, 0x1409, 0x9018, 0, 0, timedia_9018a }, | 2932 | { 0x1409, 0x7268, 0x1409, 0x9018, 0, 0, timedia_9018a }, |
2931 | { 0x14f2, 0x0121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, mobility_pp }, | ||
2932 | { PCI_VENDOR_ID_SYBA, PCI_DEVICE_ID_SYBA_2P_EPP, | 2933 | { PCI_VENDOR_ID_SYBA, PCI_DEVICE_ID_SYBA_2P_EPP, |
2933 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, syba_2p_epp }, | 2934 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, syba_2p_epp }, |
2934 | { PCI_VENDOR_ID_SYBA, PCI_DEVICE_ID_SYBA_1P_ECP, | 2935 | { PCI_VENDOR_ID_SYBA, PCI_DEVICE_ID_SYBA_1P_ECP, |
@@ -2946,8 +2947,25 @@ static const struct pci_device_id parport_pc_pci_tbl[] = { | |||
2946 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_954 }, | 2947 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_954 }, |
2947 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_12PCI840, | 2948 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_12PCI840, |
2948 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_840 }, | 2949 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_840 }, |
2950 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe840, | ||
2951 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, | ||
2952 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe840_G, | ||
2953 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, | ||
2954 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_0, | ||
2955 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, | ||
2956 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_0_G, | ||
2957 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, | ||
2958 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1, | ||
2959 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, | ||
2960 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1_G, | ||
2961 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, | ||
2962 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1_U, | ||
2963 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, | ||
2964 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1_GU, | ||
2965 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, | ||
2949 | { PCI_VENDOR_ID_AKS, PCI_DEVICE_ID_AKS_ALADDINCARD, | 2966 | { PCI_VENDOR_ID_AKS, PCI_DEVICE_ID_AKS_ALADDINCARD, |
2950 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, aks_0100 }, | 2967 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, aks_0100 }, |
2968 | { 0x14f2, 0x0121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, mobility_pp }, | ||
2951 | /* NetMos communication controllers */ | 2969 | /* NetMos communication controllers */ |
2952 | { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9705, | 2970 | { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9705, |
2953 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9705 }, | 2971 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9705 }, |