3 files changed, 18 insertions, 28 deletions

diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index 801c98f30e5c..c82105920d71 100644
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -110,7 +110,7 @@ config HISAX_16_3
 
 config HISAX_TELESPCI
         bool "Teles PCI"
-        depends on PCI && (BROKEN || !(SPARC64 || PPC))
+        depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K))
         help
           This enables HiSax support for the Teles PCI.
           See <file:Documentation/isdn/README.HiSax> on how to configure it.
@@ -238,7 +238,7 @@ config HISAX_MIC
 
 config HISAX_NETJET
         bool "NETjet card"
-        depends on PCI && (BROKEN || !(SPARC64 || PPC))
+        depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K))
         help
           This enables HiSax support for the NetJet from Traverse
           Technologies.
@@ -249,7 +249,7 @@ config HISAX_NETJET
 
 config HISAX_NETJET_U
         bool "NETspider U card"
-        depends on PCI && (BROKEN || !(SPARC64 || PPC))
+        depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K))
         help
           This enables HiSax support for the Netspider U interface ISDN card
           from Traverse Technologies.
@@ -317,7 +317,7 @@ config HISAX_GAZEL
 
 config HISAX_HFC_PCI
         bool "HFC PCI-Bus cards"
-        depends on PCI && (BROKEN || !(SPARC64 || PPC))
+        depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K))
         help
           This enables HiSax support for the HFC-S PCI 2BDS0 based cards.
 
@@ -344,14 +344,14 @@ config HISAX_HFC_SX
 
 config HISAX_ENTERNOW_PCI
         bool "Formula-n enter:now PCI card"
-        depends on PCI && (BROKEN || !(SPARC64 || PPC))
+        depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K))
         help
           This enables HiSax support for the Formula-n enter:now PCI
           ISDN card.
 
 config HISAX_AMD7930
         bool "Am7930 (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && (SPARC32 || SPARC64)
+        depends on EXPERIMENTAL && SPARC
         help
           This enables HiSax support for the AMD7930 chips on some SPARCs.
           This code is not finished yet.
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index 32bf0d5d0f9a..f8457ef48826 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -71,78 +71,68 @@ typedef struct {
 /****************************************/
 static struct usb_device_id hfcusb_idtab[] = {
         {
-         .idVendor = 0x0959,
-         .idProduct = 0x2bd0,
+         USB_DEVICE(0x0959, 0x2bd0),
          .driver_info = (unsigned long) &((hfcsusb_vdata)
                           {LED_OFF, {4, 0, 2, 1},
                            "ISDN USB TA (Cologne Chip HFC-S USB based)"}),
         },
         {
-         .idVendor = 0x0675,
-         .idProduct = 0x1688,
+         USB_DEVICE(0x0675, 0x1688),
          .driver_info = (unsigned long) &((hfcsusb_vdata)
                           {LED_SCHEME1, {1, 2, 0, 0},
                            "DrayTek miniVigor 128 USB ISDN TA"}),
         },
         {
-         .idVendor = 0x07b0,
-         .idProduct = 0x0007,
+         USB_DEVICE(0x07b0, 0x0007),
          .driver_info = (unsigned long) &((hfcsusb_vdata)
                           {LED_SCHEME1, {0x80, -64, -32, -16},
                            "Billion tiny USB ISDN TA 128"}),
         },
         {
-         .idVendor = 0x0742,
-         .idProduct = 0x2008,
+         USB_DEVICE(0x0742, 0x2008),
          .driver_info = (unsigned long) &((hfcsusb_vdata)
                           {LED_SCHEME1, {4, 0, 2, 1},
                            "Stollmann USB TA"}),
          },
         {
-         .idVendor = 0x0742,
-         .idProduct = 0x2009,
+         USB_DEVICE(0x0742, 0x2009),
          .driver_info = (unsigned long) &((hfcsusb_vdata)
                           {LED_SCHEME1, {4, 0, 2, 1},
                            "Aceex USB ISDN TA"}),
          },
         {
-         .idVendor = 0x0742,
-         .idProduct = 0x200A,
+         USB_DEVICE(0x0742, 0x200A),
          .driver_info = (unsigned long) &((hfcsusb_vdata)
                           {LED_SCHEME1, {4, 0, 2, 1},
                            "OEM USB ISDN TA"}),
          },
         {
-         .idVendor = 0x08e3,
-         .idProduct = 0x0301,
+         USB_DEVICE(0x08e3, 0x0301),
          .driver_info = (unsigned long) &((hfcsusb_vdata)
                           {LED_SCHEME1, {2, 0, 1, 4},
                            "Olitec USB RNIS"}),
          },
         {
-         .idVendor = 0x07fa,
-         .idProduct = 0x0846,
+         USB_DEVICE(0x07fa, 0x0846),
          .driver_info = (unsigned long) &((hfcsusb_vdata)
                           {LED_SCHEME1, {0x80, -64, -32, -16},
                            "Bewan Modem RNIS USB"}),
          },
         {
-         .idVendor = 0x07fa,
-         .idProduct = 0x0847,
+         USB_DEVICE(0x07fa, 0x0847),
          .driver_info = (unsigned long) &((hfcsusb_vdata)
                           {LED_SCHEME1, {0x80, -64, -32, -16},
                            "Djinn Numeris USB"}),
          },
         {
-         .idVendor = 0x07b0,
-         .idProduct = 0x0006,
+         USB_DEVICE(0x07b0, 0x0006),
          .driver_info = (unsigned long) &((hfcsusb_vdata)
                           {LED_SCHEME1, {0x80, -64, -32, -16},
                            "Twister ISDN TA"}),
          },
+        { }
 };
 
-
 /***************************************************************/
 /* structure defining input+output fifos (interrupt/bulk mode) */
 /***************************************************************/
diff --git a/drivers/isdn/pcbit/Kconfig b/drivers/isdn/pcbit/Kconfig
index f06997faef16..0933881ab0c2 100644
--- a/drivers/isdn/pcbit/Kconfig
+++ b/drivers/isdn/pcbit/Kconfig
@@ -3,7 +3,7 @@
 #
 config ISDN_DRV_PCBIT
         tristate "PCBIT-D support"
-        depends on ISDN_I4L && ISA && (BROKEN || !PPC)
+        depends on ISDN_I4L && ISA && (BROKEN || X86)
         help
           This enables support for the PCBIT ISDN-card.  This card is
           manufactured in Portugal by Octal.  For running this card,