diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /drivers/isdn/hisax/icc.h | |
parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/isdn/hisax/icc.h')
-rw-r--r-- | drivers/isdn/hisax/icc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/icc.h b/drivers/isdn/hisax/icc.h index b3bb3d5de53..e7f593967e4 100644 --- a/drivers/isdn/hisax/icc.h +++ b/drivers/isdn/hisax/icc.h @@ -65,7 +65,7 @@ #define ICC_IND_AIL 0xE #define ICC_IND_DC 0xF -extern void __init ICCVersion(struct IsdnCardState *cs, char *s); +extern void ICCVersion(struct IsdnCardState *cs, char *s); extern void initicc(struct IsdnCardState *cs); extern void icc_interrupt(struct IsdnCardState *cs, u_char val); extern void clear_pending_icc_ints(struct IsdnCardState *cs); |