diff -urN linux/drivers/isdn/eicon/eicon_mod.c linux-2.3.16-work/drivers/isdn/eicon/eicon_mod.c
--- linux/drivers/isdn/eicon/eicon_mod.c	Tue Aug 31 00:27:43 1999
+++ linux-2.3.16-work/drivers/isdn/eicon/eicon_mod.c	Wed Sep  1 09:35:24 1999
@@ -1275,8 +1275,8 @@
 #define eicon_init init_module
 #endif
 
-__initfunc(int
-eicon_init(void))
+int __init
+eicon_init(void)
 {
 	int card_count = 0;
 	int release = 0;
@@ -1392,8 +1392,8 @@
 
 	str = get_options(line, 4, ints);
 #else
-__initfunc(void
-eicon_setup(char *str, int *ints))
+void __init
+eicon_setup(char *str, int *ints)
 {
         int i, argc;
 #endif
diff -urN linux/drivers/isdn/hisax/amd7930.c linux-2.3.16-work/drivers/isdn/hisax/amd7930.c
--- linux/drivers/isdn/hisax/amd7930.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/amd7930.c	Wed Sep  1 09:29:00 1999
@@ -749,8 +749,8 @@
 	return(0);
 }
 
-__initfunc(int
-setup_amd7930(struct IsdnCard *card))
+int __init
+setup_amd7930(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];
diff -urN linux/drivers/isdn/hisax/asuscom.c linux-2.3.16-work/drivers/isdn/hisax/asuscom.c
--- linux/drivers/isdn/hisax/asuscom.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/asuscom.c	Wed Sep  1 09:29:13 1999
@@ -326,8 +326,8 @@
 	return(0);
 }
 
-__initfunc(int
-setup_asuscom(struct IsdnCard *card))
+int __init
+setup_asuscom(struct IsdnCard *card)
 {
 	int bytecnt;
 	struct IsdnCardState *cs = card->cs;
diff -urN linux/drivers/isdn/hisax/avm_a1.c linux-2.3.16-work/drivers/isdn/hisax/avm_a1.c
--- linux/drivers/isdn/hisax/avm_a1.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/avm_a1.c	Wed Sep  1 09:25:39 1999
@@ -227,8 +227,8 @@
 	return(0);
 }
 
-__initfunc(int
-setup_avm_a1(struct IsdnCard *card))
+int __init
+setup_avm_a1(struct IsdnCard *card)
 {
 	u_char val;
 	struct IsdnCardState *cs = card->cs;
diff -urN linux/drivers/isdn/hisax/avm_a1p.c linux-2.3.16-work/drivers/isdn/hisax/avm_a1p.c
--- linux/drivers/isdn/hisax/avm_a1p.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/avm_a1p.c	Wed Sep  1 09:31:35 1999
@@ -262,8 +262,8 @@
 	return 0;
 }
 
-__initfunc(int
-setup_avm_a1_pcmcia(struct IsdnCard *card))
+int __init
+setup_avm_a1_pcmcia(struct IsdnCard *card)
 {
 	u_char model, vers;
 	struct IsdnCardState *cs = card->cs;
diff -urN linux/drivers/isdn/hisax/avm_pci.c linux-2.3.16-work/drivers/isdn/hisax/avm_pci.c
--- linux/drivers/isdn/hisax/avm_pci.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/avm_pci.c	Wed Sep  1 09:31:47 1999
@@ -779,8 +779,8 @@
 static  int pci_index __initdata = 0;
 #endif
 
-__initfunc(int
-setup_avm_pcipnp(struct IsdnCard *card))
+int __init
+setup_avm_pcipnp(struct IsdnCard *card)
 {
 	u_int val, ver;
 	struct IsdnCardState *cs = card->cs;
diff -urN linux/drivers/isdn/hisax/bkm_a4t.c linux-2.3.16-work/drivers/isdn/hisax/bkm_a4t.c
--- linux/drivers/isdn/hisax/bkm_a4t.c	Wed Aug 25 23:18:08 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/bkm_a4t.c	Wed Sep  1 09:32:26 1999
@@ -294,8 +294,8 @@
 static int pci_index __initdata = 0;
 #endif
 
-__initfunc(int
-	   setup_bkm_a4t(struct IsdnCard *card))
+int __init
+	   setup_bkm_a4t(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];
diff -urN linux/drivers/isdn/hisax/bkm_a8.c linux-2.3.16-work/drivers/isdn/hisax/bkm_a8.c
--- linux/drivers/isdn/hisax/bkm_a8.c	Wed Aug 25 23:18:08 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/bkm_a8.c	Wed Sep  1 09:32:38 1999
@@ -347,8 +347,8 @@
 static int pci_index __initdata = 0;
 #endif
 
-__initfunc(int
-	   setup_sct_quadro(struct IsdnCard *card))
+int __init
+	   setup_sct_quadro(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];
diff -urN linux/drivers/isdn/hisax/config.c linux-2.3.16-work/drivers/isdn/hisax/config.c
--- linux/drivers/isdn/hisax/config.c	Tue Aug 31 00:27:43 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/config.c	Wed Sep  1 09:26:34 1999
@@ -571,8 +571,8 @@
 
 	str = get_options(line, MAX_ARG, ints);
 #else
-__initfunc(void
-HiSax_setup(char *str, int *ints))
+void __init
+HiSax_setup(char *str, int *ints)
 {
 	int i, j, argc;
 #endif        
@@ -1442,8 +1442,8 @@
 }
 
 
-__initfunc(int
-HiSax_init(void))
+int __init
+HiSax_init(void)
 {
 	int i;
 
diff -urN linux/drivers/isdn/hisax/diva.c linux-2.3.16-work/drivers/isdn/hisax/diva.c
--- linux/drivers/isdn/hisax/diva.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/diva.c	Wed Sep  1 09:29:25 1999
@@ -888,8 +888,8 @@
 static  int pci_index __initdata = 0;
 #endif
 
-__initfunc(int
-setup_diva(struct IsdnCard *card))
+int __init
+setup_diva(struct IsdnCard *card)
 {
 	int bytecnt;
 	u_char val;
diff -urN linux/drivers/isdn/hisax/gazel.c linux-2.3.16-work/drivers/isdn/hisax/gazel.c
--- linux/drivers/isdn/hisax/gazel.c	Wed Aug 25 23:18:08 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/gazel.c	Wed Sep  1 09:32:51 1999
@@ -690,8 +690,8 @@
 	return (0);
 }
 
-__initfunc(int
-	   setup_gazel(struct IsdnCard *card))
+int __init
+	   setup_gazel(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];
diff -urN linux/drivers/isdn/hisax/hfc_2bds0.c linux-2.3.16-work/drivers/isdn/hisax/hfc_2bds0.c
--- linux/drivers/isdn/hisax/hfc_2bds0.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/hfc_2bds0.c	Wed Sep  1 09:29:48 1999
@@ -1172,8 +1172,8 @@
 #endif
 }
 
-__initfunc(unsigned int
-*init_send_hfcd(int cnt))
+unsigned int * __init
+init_send_hfcd(int cnt)
 {
 	int i, *send;
 
@@ -1187,8 +1187,8 @@
 	return(send);
 }
 
-__initfunc(void
-init2bds0(struct IsdnCardState *cs))
+void __init
+init2bds0(struct IsdnCardState *cs)
 {
 	cs->setstack_d = setstack_hfcd;
 	cs->dbusytimer.function = (void *) hfc_dbusy_timer;
diff -urN linux/drivers/isdn/hisax/hfc_2bs0.c linux-2.3.16-work/drivers/isdn/hisax/hfc_2bs0.c
--- linux/drivers/isdn/hisax/hfc_2bs0.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/hfc_2bs0.c	Wed Sep  1 09:30:07 1999
@@ -559,8 +559,8 @@
 	return (0);
 }
 
-__initfunc(void
-init_send(struct BCState *bcs))
+void __init
+init_send(struct BCState *bcs)
 {
 	int i;
 
@@ -573,8 +573,8 @@
 		bcs->hw.hfc.send[i] = 0x1fff;
 }
 
-__initfunc(void
-inithfc(struct IsdnCardState *cs))
+void __init
+inithfc(struct IsdnCardState *cs)
 {
 	init_send(&cs->bcs[0]);
 	init_send(&cs->bcs[1]);
diff -urN linux/drivers/isdn/hisax/hfc_pci.c linux-2.3.16-work/drivers/isdn/hisax/hfc_pci.c
--- linux/drivers/isdn/hisax/hfc_pci.c	Tue Aug 31 00:27:43 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/hfc_pci.c	Wed Sep  1 09:34:29 1999
@@ -1513,8 +1513,8 @@
 /*************************************/
 /* Alloc memory send data for queues */
 /*************************************/
-__initfunc(unsigned int
-	   *init_send_hfcpci(int cnt))
+unsigned int * __init 
+	init_send_hfcpci(int cnt)
 {
 	int i, *send;
 
@@ -1531,8 +1531,8 @@
 /********************************/
 /* called for card init message */
 /********************************/
-__initfunc(void
-	   inithfcpci(struct IsdnCardState *cs))
+void __init
+	inithfcpci(struct IsdnCardState *cs)
 {
 	cs->setstack_d = setstack_hfcpci;
 	cs->dbusytimer.function = (void *) hfcpci_dbusy_timer;
@@ -1604,8 +1604,8 @@
 
 #endif				/* CONFIG_PCI */
 
-__initfunc(int
-	   setup_hfcpci(struct IsdnCard *card))
+int __init
+	setup_hfcpci(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];
diff -urN linux/drivers/isdn/hisax/hfcscard.c linux-2.3.16-work/drivers/isdn/hisax/hfcscard.c
--- linux/drivers/isdn/hisax/hfcscard.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/hfcscard.c	Wed Sep  1 09:34:42 1999
@@ -148,8 +148,8 @@
 	return(0);
 }
 
-__initfunc(int
-setup_hfcs(struct IsdnCard *card))
+int __init
+setup_hfcs(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];
diff -urN linux/drivers/isdn/hisax/hisax.h linux-2.3.16-work/drivers/isdn/hisax/hisax.h
--- linux/drivers/isdn/hisax/hisax.h	Wed Aug 25 23:18:08 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/hisax.h	Wed Sep  1 09:28:05 1999
@@ -1007,6 +1007,10 @@
 #define __initdata
 #endif
 
+#ifndef __init
+#define __init
+#endif
+
 #define HISAX_INITFUNC(__arginit) __initfunc(__arginit)
 #define HISAX_INITDATA __initdata
 
diff -urN linux/drivers/isdn/hisax/isurf.c linux-2.3.16-work/drivers/isdn/hisax/isurf.c
--- linux/drivers/isdn/hisax/isurf.c	Wed Aug 25 23:18:08 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/isurf.c	Wed Sep  1 09:34:55 1999
@@ -206,8 +206,8 @@
 	return(isar_auxcmd(cs, ic));
 }
 
-__initfunc(int
-setup_isurf(struct IsdnCard *card))
+int __init
+setup_isurf(struct IsdnCard *card)
 {
 	int ver;
 	struct IsdnCardState *cs = card->cs;
diff -urN linux/drivers/isdn/hisax/ix1_micro.c linux-2.3.16-work/drivers/isdn/hisax/ix1_micro.c
--- linux/drivers/isdn/hisax/ix1_micro.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/ix1_micro.c	Wed Sep  1 09:28:18 1999
@@ -282,8 +282,8 @@
 }
 
 
-__initfunc(int
-setup_ix1micro(struct IsdnCard *card))
+int __init
+setup_ix1micro(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];
diff -urN linux/drivers/isdn/hisax/mic.c linux-2.3.16-work/drivers/isdn/hisax/mic.c
--- linux/drivers/isdn/hisax/mic.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/mic.c	Wed Sep  1 09:30:20 1999
@@ -224,8 +224,8 @@
 	return(0);
 }
 
-__initfunc(int
-setup_mic(struct IsdnCard *card))
+int __init
+setup_mic(struct IsdnCard *card)
 {
 	int bytecnt;
 	struct IsdnCardState *cs = card->cs;
diff -urN linux/drivers/isdn/hisax/netjet.c linux-2.3.16-work/drivers/isdn/hisax/netjet.c
--- linux/drivers/isdn/hisax/netjet.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/netjet.c	Wed Sep  1 09:30:38 1999
@@ -889,8 +889,8 @@
 }
 
  
-__initfunc(void
-inittiger(struct IsdnCardState *cs))
+void __init
+inittiger(struct IsdnCardState *cs)
 {
 	if (!(cs->bcs[0].hw.tiger.send = kmalloc(NETJET_DMA_TXSIZE * sizeof(unsigned int),
 		GFP_KERNEL | GFP_DMA))) {
@@ -1080,8 +1080,8 @@
 static  int pci_index __initdata = 0;
 #endif
 
-__initfunc(int
-setup_netjet(struct IsdnCard *card))
+int __init
+setup_netjet(struct IsdnCard *card)
 {
 	int bytecnt;
 	struct IsdnCardState *cs = card->cs;
diff -urN linux/drivers/isdn/hisax/niccy.c linux-2.3.16-work/drivers/isdn/hisax/niccy.c
--- linux/drivers/isdn/hisax/niccy.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/niccy.c	Wed Sep  1 09:25:52 1999
@@ -265,8 +265,8 @@
 static  int pci_index __initdata = 0;
 #endif
 
-__initfunc(int
-setup_niccy(struct IsdnCard *card))
+int __init
+setup_niccy(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];
diff -urN linux/drivers/isdn/hisax/s0box.c linux-2.3.16-work/drivers/isdn/hisax/s0box.c
--- linux/drivers/isdn/hisax/s0box.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/s0box.c	Wed Sep  1 09:32:00 1999
@@ -212,8 +212,8 @@
 	return(0);
 }
 
-__initfunc(int
-setup_s0box(struct IsdnCard *card))
+int __init
+setup_s0box(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];
diff -urN linux/drivers/isdn/hisax/saphir.c linux-2.3.16-work/drivers/isdn/hisax/saphir.c
--- linux/drivers/isdn/hisax/saphir.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/saphir.c	Wed Sep  1 09:35:07 1999
@@ -265,8 +265,8 @@
 }
 
 
-__initfunc(int
-setup_saphir(struct IsdnCard *card))
+int __init
+setup_saphir(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];
diff -urN linux/drivers/isdn/hisax/sedlbauer.c linux-2.3.16-work/drivers/isdn/hisax/sedlbauer.c
--- linux/drivers/isdn/hisax/sedlbauer.c	Tue Aug 31 00:27:43 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/sedlbauer.c	Wed Sep  1 09:30:51 1999
@@ -549,8 +549,8 @@
 #endif
 #endif
 
-__initfunc(int
-setup_sedlbauer(struct IsdnCard *card))
+int __init
+setup_sedlbauer(struct IsdnCard *card)
 {
 	int bytecnt, ver, val;
 	struct IsdnCardState *cs = card->cs;
diff -urN linux/drivers/isdn/hisax/sportster.c linux-2.3.16-work/drivers/isdn/hisax/sportster.c
--- linux/drivers/isdn/hisax/sportster.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/sportster.c	Wed Sep  1 09:31:10 1999
@@ -208,8 +208,8 @@
 	return(0);
 }
 
-__initfunc(int
-get_io_range(struct IsdnCardState *cs))
+int __init
+get_io_range(struct IsdnCardState *cs)
 {
 	int i, j, adr;
 	
@@ -234,8 +234,8 @@
 	}
 }
 
-__initfunc(int
-setup_sportster(struct IsdnCard *card))
+int __init
+setup_sportster(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];
diff -urN linux/drivers/isdn/hisax/teleint.c linux-2.3.16-work/drivers/isdn/hisax/teleint.c
--- linux/drivers/isdn/hisax/teleint.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/teleint.c	Wed Sep  1 09:31:23 1999
@@ -289,8 +289,8 @@
 	return(0);
 }
 
-__initfunc(int
-setup_TeleInt(struct IsdnCard *card))
+int __init
+setup_TeleInt(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];
diff -urN linux/drivers/isdn/hisax/teles0.c linux-2.3.16-work/drivers/isdn/hisax/teles0.c
--- linux/drivers/isdn/hisax/teles0.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/teles0.c	Wed Sep  1 09:28:31 1999
@@ -295,8 +295,8 @@
 	return(0);
 }
 
-__initfunc(int
-setup_teles0(struct IsdnCard *card))
+int __init
+setup_teles0(struct IsdnCard *card)
 {
 	u_char val;
 	struct IsdnCardState *cs = card->cs;
diff -urN linux/drivers/isdn/hisax/teles3.c linux-2.3.16-work/drivers/isdn/hisax/teles3.c
--- linux/drivers/isdn/hisax/teles3.c	Tue Aug 31 00:27:43 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/teles3.c	Wed Sep  1 09:28:47 1999
@@ -321,8 +321,8 @@
 	return(0);
 }
 
-__initfunc(int
-setup_teles3(struct IsdnCard *card))
+int __init
+setup_teles3(struct IsdnCard *card)
 {
 	u_char val;
 	struct IsdnCardState *cs = card->cs;
diff -urN linux/drivers/isdn/hisax/telespci.c linux-2.3.16-work/drivers/isdn/hisax/telespci.c
--- linux/drivers/isdn/hisax/telespci.c	Thu Aug 12 17:42:33 1999
+++ linux-2.3.16-work/drivers/isdn/hisax/telespci.c	Wed Sep  1 09:32:12 1999
@@ -310,8 +310,8 @@
 static 	int pci_index __initdata = 0;
 #endif
 
-__initfunc(int
-setup_telespci(struct IsdnCard *card))
+int __init
+setup_telespci(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	char tmp[64];
diff -urN linux/drivers/net/hamradio/yam.c linux-2.3.16-work/drivers/net/hamradio/yam.c
--- linux/drivers/net/hamradio/yam.c	Wed Aug 18 19:38:51 1999
+++ linux-2.3.16-work/drivers/net/hamradio/yam.c	Wed Sep  1 09:25:01 1999
@@ -1201,7 +1201,7 @@
 
 /* --------------------------------------------------------------------- */
 
-__initfunc(int yam_init(struct net_device *dev))
+int __init yam_init(struct net_device *dev)
 {
 	int i;
 
@@ -1267,7 +1267,7 @@
 
 #endif
 
-__initfunc(int init_module(void))
+int init_module(void)
 {
 	int ret = yam_init(NULL);