diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /drivers/isdn/hisax/avm_a1.c | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/isdn/hisax/avm_a1.c')
| -rw-r--r-- | drivers/isdn/hisax/avm_a1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/avm_a1.c b/drivers/isdn/hisax/avm_a1.c index 9a8b02557ff9..729e906bdc61 100644 --- a/drivers/isdn/hisax/avm_a1.c +++ b/drivers/isdn/hisax/avm_a1.c | |||
| @@ -178,7 +178,7 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg) | |||
| 178 | return(0); | 178 | return(0); |
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | int __init | 181 | int __devinit |
| 182 | setup_avm_a1(struct IsdnCard *card) | 182 | setup_avm_a1(struct IsdnCard *card) |
| 183 | { | 183 | { |
| 184 | u_char val; | 184 | u_char val; |