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/bkm_a4t.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/isdn/hisax/bkm_a4t.c')
| -rw-r--r-- | drivers/isdn/hisax/bkm_a4t.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c index 3cf1f2421789..87a630128a6c 100644 --- a/drivers/isdn/hisax/bkm_a4t.c +++ b/drivers/isdn/hisax/bkm_a4t.c | |||
| @@ -255,9 +255,9 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg) | |||
| 255 | return (0); | 255 | return (0); |
| 256 | } | 256 | } |
| 257 | 257 | ||
| 258 | static struct pci_dev *dev_a4t __initdata = NULL; | 258 | static struct pci_dev *dev_a4t __devinitdata = NULL; |
| 259 | 259 | ||
| 260 | int __init | 260 | int __devinit |
| 261 | setup_bkm_a4t(struct IsdnCard *card) | 261 | setup_bkm_a4t(struct IsdnCard *card) |
| 262 | { | 262 | { |
| 263 | struct IsdnCardState *cs = card->cs; | 263 | struct IsdnCardState *cs = card->cs; |