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

• Lines: 80
• Date: Wed Nov 29 10:12:29 2000
• Orig file: v2.4.0-test11/linux/drivers/isdn/hisax/w6692.c
• Orig date: Sun Nov 19 18:44:08 2000

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/isdn/hisax/w6692.c linux/drivers/isdn/hisax/w6692.c
@@ -1,4 +1,4 @@
-/* $Id: w6692.c,v 1.8 2000/09/07 20:33:30 werner Exp $
+/* $Id: w6692.c,v 1.12.6.2 2000/11/29 16:00:14 kai Exp $
  *
  * w6692.c   Winbond W6692 specific routines
  *
@@ -10,6 +10,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/init.h>
 #define __NO_VERSION__
 #include "hisax.h"
 #include "w6692.h"
@@ -17,18 +18,6 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 
-#ifndef PCI_VENDOR_ID_ASUSCOM
-#define PCI_VENDOR_ID_ASUSCOM	0x675
-#endif
-#ifndef PCI_DEVICE_ID_ASUSCOM_TA1
-#define PCI_DEVICE_ID_ASUSCOM_TA1	0x1702
-#endif
-#ifndef PCI_VENDOR_ID_WINBOND2
-#define PCI_VENDOR_ID_WINBOND2	0x1050
-#endif
-#ifndef PCI_DEVICE_ID_WINBOND_6692
-#define	PCI_DEVICE_ID_WINBOND_6692	0x6692
-#endif
 /* table entry in the PCI devices list */
 typedef struct {
 	int vendor_id;
@@ -39,18 +28,18 @@
 
 static const PCI_ENTRY id_list[] =
 {
-	{PCI_VENDOR_ID_ASUSCOM, PCI_DEVICE_ID_ASUSCOM_TA1, "AsusCom", "TA XXX"},
-	{PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND_6692, "Winbond", "W6692"},
+	{PCI_VENDOR_ID_DYNALINK, PCI_DEVICE_ID_DYNALINK_IS64PH, "Dynalink/AsusCom", "IS64PH"},
+	{PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_6692, "Winbond", "W6692"},
 	{0, 0, NULL, NULL}
 };
 
 extern const char *CardType[];
 
-const char *w6692_revision = "$Revision: 1.8 $";
+const char *w6692_revision = "$Revision: 1.12.6.2 $";
 
 #define DBUSY_TIMER_VALUE 80
 
-static char *W6692Ver[] HISAX_INITDATA =
+static char *W6692Ver[] __initdata =
 {"W6692 V00", "W6692 V01", "W6692 V10",
  "W6692 V11"};
 
@@ -869,7 +858,7 @@
 	return (0);
 }
 
-HISAX_INITFUNC(void initW6692(struct IsdnCardState *cs, int part))
+void __init initW6692(struct IsdnCardState *cs, int part)
 {
 	if (part & 1) {
 		cs->tqueue.routine = (void *) (void *) W6692_bh;
@@ -966,11 +955,12 @@
 	return (0);
 }
 
-static int id_idx = 0;
+static int id_idx ;
 
 static struct pci_dev *dev_w6692 __initdata = NULL;
 
-__initfunc(int setup_w6692(struct IsdnCard *card))
+int __init 
+setup_w6692(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];