diff options
author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/isdn/hisax/hfc_2bs0.c | |
parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) |
Merge branch 'merge'
Diffstat (limited to 'drivers/isdn/hisax/hfc_2bs0.c')
-rw-r--r-- | drivers/isdn/hisax/hfc_2bs0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/hfc_2bs0.c b/drivers/isdn/hisax/hfc_2bs0.c index c964539cc43e..d0520ad30677 100644 --- a/drivers/isdn/hisax/hfc_2bs0.c +++ b/drivers/isdn/hisax/hfc_2bs0.c | |||
@@ -551,7 +551,7 @@ setstack_hfc(struct PStack *st, struct BCState *bcs) | |||
551 | return (0); | 551 | return (0); |
552 | } | 552 | } |
553 | 553 | ||
554 | static void __init | 554 | static void |
555 | init_send(struct BCState *bcs) | 555 | init_send(struct BCState *bcs) |
556 | { | 556 | { |
557 | int i; | 557 | int i; |
@@ -565,7 +565,7 @@ init_send(struct BCState *bcs) | |||
565 | bcs->hw.hfc.send[i] = 0x1fff; | 565 | bcs->hw.hfc.send[i] = 0x1fff; |
566 | } | 566 | } |
567 | 567 | ||
568 | void __init | 568 | void |
569 | inithfc(struct IsdnCardState *cs) | 569 | inithfc(struct IsdnCardState *cs) |
570 | { | 570 | { |
571 | init_send(&cs->bcs[0]); | 571 | init_send(&cs->bcs[0]); |