patch-2.4.0-test12 linux/drivers/isdn/hisax/diva.c

• Lines: 62
• Date: Wed Nov 29 10:12:29 2000
• Orig file: v2.4.0-test11/linux/drivers/isdn/hisax/diva.c
• Orig date: Mon Aug 21 07:49:03 2000

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/isdn/hisax/diva.c linux/drivers/isdn/hisax/diva.c
@@ -1,4 +1,4 @@
-/* $Id: diva.c,v 1.21 2000/06/26 08:59:12 keil Exp $
+/* $Id: diva.c,v 1.25.6.2 2000/11/29 16:00:14 kai Exp $
  *
  * diva.c     low level stuff for Eicon.Diehl Diva Family ISDN cards
  *
@@ -13,6 +13,7 @@
  */
 
 #define __NO_VERSION__
+#include <linux/init.h>
 #include <linux/config.h>
 #include "hisax.h"
 #include "isac.h"
@@ -23,7 +24,7 @@
 
 extern const char *CardType[];
 
-const char *Diva_revision = "$Revision: 1.21 $";
+const char *Diva_revision = "$Revision: 1.25.6.2 $";
 
 #define byteout(addr,val) outb(val,addr)
 #define bytein(addr) inb(addr)
@@ -46,20 +47,6 @@
 #define DIVA_IPAC_ISA	3
 #define DIVA_IPAC_PCI	4
 
-/* PCI stuff */
-#ifndef PCI_VENDOR_ID_EICON
-#define PCI_VENDOR_ID_EICON	0x1133
-#endif
-#ifndef PCI_DEVICE_ID_EICON_DIVA20
-#define PCI_DEVICE_ID_EICON_DIVA20	0xe002
-#endif
-#ifndef PCI_DEVICE_ID_EICON_DIVA20_U
-#define PCI_DEVICE_ID_EICON_DIVA20_U	0xe004
-#endif
-#ifndef PCI_DEVICE_ID_EICON_DIVA201
-#define PCI_DEVICE_ID_EICON_DIVA201	0xe005
-#endif
-
 /* CTRL (Read) */
 #define DIVA_IRQ_STAT	0x01
 #define DIVA_EEPROM_SDA	0x02
@@ -833,12 +820,12 @@
 	return(0);
 }
 
-static 	struct pci_dev *dev_diva __initdata = NULL;
-static 	struct pci_dev *dev_diva_u __initdata = NULL;
-static 	struct pci_dev *dev_diva201 __initdata = NULL;
+static struct pci_dev *dev_diva __initdata = NULL;
+static struct pci_dev *dev_diva_u __initdata = NULL;
+static struct pci_dev *dev_diva201 __initdata = NULL;
 
-__initfunc(int
-setup_diva(struct IsdnCard *card))
+int __init
+setup_diva(struct IsdnCard *card)
 {
 	int bytecnt;
 	u_char val;