diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /drivers/isdn/hisax/avm_a1.c | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'drivers/isdn/hisax/avm_a1.c')
| -rw-r--r-- | drivers/isdn/hisax/avm_a1.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/isdn/hisax/avm_a1.c b/drivers/isdn/hisax/avm_a1.c index cc3ce4490..e2765970e 100644 --- a/drivers/isdn/hisax/avm_a1.c +++ b/drivers/isdn/hisax/avm_a1.c @@ -1,4 +1,4 @@ -/* $Id: avm_a1.c,v 2.12 2000/06/26 08:59:12 keil Exp $ +/* $Id: avm_a1.c,v 2.13 2000/11/24 17:05:37 kai Exp $ * * avm_a1.c low level stuff for AVM A1 (Fritz) isdn cards * @@ -8,13 +8,14 @@ * */ #define __NO_VERSION__ +#include <linux/init.h> #include "hisax.h" #include "isac.h" #include "hscx.h" #include "isdnl1.h" extern const char *CardType[]; -static const char *avm_revision = "$Revision: 2.12 $"; +static const char *avm_revision = "$Revision: 2.13 $"; #define AVM_A1_STAT_ISAC 0x01 #define AVM_A1_STAT_HSCX 0x02 @@ -171,8 +172,8 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg) 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; |