summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/bkm_ax.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-28 22:00:09 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-28 22:00:09 +0000
commit1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch)
tree141e31f89f18b9fe0831f31852e0435ceaccafc5 /drivers/isdn/hisax/bkm_ax.h
parentfb9c690a18b3d66925a65b17441c37fa14d4370b (diff)
Merge with 2.4.0-test7.
Diffstat (limited to 'drivers/isdn/hisax/bkm_ax.h')
-rw-r--r--drivers/isdn/hisax/bkm_ax.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/isdn/hisax/bkm_ax.h b/drivers/isdn/hisax/bkm_ax.h
index 418c4bd47..e513c81a6 100644
--- a/drivers/isdn/hisax/bkm_ax.h
+++ b/drivers/isdn/hisax/bkm_ax.h
@@ -19,13 +19,21 @@
/* A4T */
-#define I20_DEVICE_ID 0x6120 /* I20 PCI device ID */
-#define I20_VENDOR_ID 0x11DE /* I20 PCI vendor ID */
+#ifndef PCI_VENDOR_ID_ZORAN
+#define PCI_VENDOR_ID_ZORAN 0x11DE
+#endif
+#ifndef PCI_DEVICE_ID_ZORAN_36120
+#define PCI_DEVICE_ID_ZORAN_36120 0x6120
+#endif
#define A4T_SUBVEN_ID 0x0871
#define A4T_SUBSYS_ID 0xFFA4
/* Scitel Quadro */
-#define PLX_DEVICE_ID 0x9050 /* Scitel Quadro PLX */
-#define PLX_VENDOR_ID 0x10B5
+#ifndef PCI_VENDOR_ID_PLX
+#define PCI_VENDOR_ID_PLX 0x10B5
+#endif
+#ifndef PCI_DEVICE_ID_PLX_9050
+#define PCI_DEVICE_ID_PLX_9050 0x9050
+#endif
#define SCT_SUBVEN_ID 0x0871
#define SCT_SUBSYS_ID 0xFFA8