Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / isdn / hardware / mISDN / hfcpci.c

diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 5940a2c..4343aba 100644 (file)
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -272,7 +272,7 @@ reset_hfcpci(struct hfc_pci *hc)
         * D- and monitor/CI channel are not enabled
         * STIO1 is used as output for data, B1+B2 from ST->IOM+HFC
         * STIO2 is used as data input, B1+B2 from IOM->ST
-        * ST B-channel send disabled -> continous 1s
+        * ST B-channel send disabled -> continuous 1s
         * The IOM slots are always enabled
         */
        if (test_bit(HFC_CFG_PCM, &hc->cfg)) {
@@ -1773,7 +1773,7 @@ init_card(struct hfc_pci *hc)
                inithfcpci(hc);
                /*
                 * Finally enable IRQ output
-                * this is only allowed, if an IRQ routine is allready
+                * this is only allowed, if an IRQ routine is already
                 * established for this HFC, so don't do that earlier
                 */
                enable_hwirq(hc);
@@ -2188,52 +2188,52 @@ static const struct _hfc_map hfc_map[] =
 
 static struct pci_device_id hfc_ids[] =
 {
-       {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_2BD0,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[0]},
-       {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B000,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[1]},
-       {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B006,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[2]},
-       {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B007,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[3]},
-       {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B008,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[4]},
-       {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B009,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[5]},
-       {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00A,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[6]},
-       {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00B,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[7]},
-       {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00C,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[8]},
-       {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B100,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[9]},
-       {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B700,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[10]},
-       {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B701,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[11]},
-       {PCI_VENDOR_ID_ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[12]},
-       {PCI_VENDOR_ID_ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[13]},
-       {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[14]},
-       {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_A1T,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[15]},
-       {PCI_VENDOR_ID_ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[16]},
-       {PCI_VENDOR_ID_ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[17]},
-       {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[18]},
-       {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_E,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[19]},
-       {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[20]},
-       {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_A,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[21]},
-       {PCI_VENDOR_ID_SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[22]},
+       { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_2BD0),
+               (unsigned long) &hfc_map[0] },
+       { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B000),
+               (unsigned long) &hfc_map[1] },
+       { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B006),
+               (unsigned long) &hfc_map[2] },
+       { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B007),
+               (unsigned long) &hfc_map[3] },
+       { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B008),
+               (unsigned long) &hfc_map[4] },
+       { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B009),
+               (unsigned long) &hfc_map[5] },
+       { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00A),
+               (unsigned long) &hfc_map[6] },
+       { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00B),
+               (unsigned long) &hfc_map[7] },
+       { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00C),
+               (unsigned long) &hfc_map[8] },
+       { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B100),
+               (unsigned long) &hfc_map[9] },
+       { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B700),
+               (unsigned long) &hfc_map[10] },
+       { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B701),
+               (unsigned long) &hfc_map[11] },
+       { PCI_VDEVICE(ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1),
+               (unsigned long) &hfc_map[12] },
+       { PCI_VDEVICE(ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675),
+               (unsigned long) &hfc_map[13] },
+       { PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT),
+               (unsigned long) &hfc_map[14] },
+       { PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_A1T),
+               (unsigned long) &hfc_map[15] },
+       { PCI_VDEVICE(ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575),
+               (unsigned long) &hfc_map[16] },
+       { PCI_VDEVICE(ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0),
+               (unsigned long) &hfc_map[17] },
+       { PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E),
+               (unsigned long) &hfc_map[18] },
+       { PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_E),
+               (unsigned long) &hfc_map[19] },
+       { PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A),
+               (unsigned long) &hfc_map[20] },
+       { PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_A),
+               (unsigned long) &hfc_map[21] },
+       { PCI_VDEVICE(SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2),
+               (unsigned long) &hfc_map[22] },
        {},
 };