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

• Lines: 62
• Date: Tue Nov 28 21:44:41 2000
• Orig file: v2.4.0-test11/linux/drivers/isdn/hisax/elsa.c
• Orig date: Mon Aug 21 07:49:03 2000

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/isdn/hisax/elsa.c linux/drivers/isdn/hisax/elsa.c
@@ -1,4 +1,4 @@
-/* $Id: elsa.c,v 2.23 2000/06/26 08:59:12 keil Exp $
+/* $Id: elsa.c,v 2.26.6.1 2000/11/28 12:02:46 kai Exp $
  *
  * elsa.c     low level stuff for Elsa isdn cards
  *
@@ -16,6 +16,7 @@
  */
 
 #define __NO_VERSION__
+#include <linux/init.h>
 #include <linux/config.h>
 #include "hisax.h"
 #include "arcofi.h"
@@ -29,7 +30,7 @@
 
 extern const char *CardType[];
 
-const char *Elsa_revision = "$Revision: 2.23 $";
+const char *Elsa_revision = "$Revision: 2.26.6.1 $";
 const char *Elsa_Types[] =
 {"None", "PC", "PCC-8", "PCC-16", "PCF", "PCF-Pro",
  "PCMCIA", "QS 1000", "QS 3000", "Microlink PCI", "QS 3000 PCI", 
@@ -66,15 +67,6 @@
 #define ELSA_PCMCIA_IPAC 11
 
 /* PCI stuff */
-#ifndef PCI_VENDOR_ID_ELSA
-#define PCI_VENDOR_ID_ELSA	0x1048
-#endif
-#ifndef PCI_DEVICE_ID_ELSA_MIRCOLINK
-#define PCI_DEVICE_ID_ELSA_MIRCOLINK	0x1000
-#endif
-#ifndef PCI_DEVICE_ID_ELSA_QS3000
-#define PCI_DEVICE_ID_ELSA_QS3000	0x3000
-#endif
 #define ELSA_PCI_IRQ_MASK	0x04
 
 /* ITAC Registeradressen (only Microlink PC) */
@@ -865,10 +857,10 @@
 	return (CARD_portlist[i]);
 }
 
-static 	struct pci_dev *dev_qs1000 __initdata = NULL;
-static 	struct pci_dev *dev_qs3000 __initdata = NULL;
+static 	struct pci_dev *dev_qs1000 __devinitdata = NULL;
+static 	struct pci_dev *dev_qs3000 __devinitdata = NULL;
 
-int
+int __devinit
 setup_elsa(struct IsdnCard *card)
 {
 	long flags;
@@ -990,7 +982,7 @@
 		}
 		cs->subtyp = 0;
 		if ((dev_qs1000 = pci_find_device(PCI_VENDOR_ID_ELSA,
-			PCI_DEVICE_ID_ELSA_MIRCOLINK, dev_qs1000))) {
+			PCI_DEVICE_ID_ELSA_MICROLINK, dev_qs1000))) {
 			if (pci_enable_device(dev_qs1000))
 				return(0);
 			cs->subtyp = ELSA_QS1000PCI;