diff options
Diffstat (limited to 'drivers/net/hp100.c')
| -rw-r--r-- | drivers/net/hp100.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index c52a1df5d922..8e10d2f6a5ad 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c | |||
| @@ -188,14 +188,14 @@ struct hp100_private { | |||
| 188 | * variables | 188 | * variables |
| 189 | */ | 189 | */ |
| 190 | #ifdef CONFIG_ISA | 190 | #ifdef CONFIG_ISA |
| 191 | static const char *const hp100_isa_tbl[] __devinitconst = { | 191 | static const char *hp100_isa_tbl[] = { |
| 192 | "HWPF150", /* HP J2573 rev A */ | 192 | "HWPF150", /* HP J2573 rev A */ |
| 193 | "HWP1950", /* HP J2573 */ | 193 | "HWP1950", /* HP J2573 */ |
| 194 | }; | 194 | }; |
| 195 | #endif | 195 | #endif |
| 196 | 196 | ||
| 197 | #ifdef CONFIG_EISA | 197 | #ifdef CONFIG_EISA |
| 198 | static const struct eisa_device_id hp100_eisa_tbl[] __devinitconst = { | 198 | static struct eisa_device_id hp100_eisa_tbl[] = { |
| 199 | { "HWPF180" }, /* HP J2577 rev A */ | 199 | { "HWPF180" }, /* HP J2577 rev A */ |
| 200 | { "HWP1920" }, /* HP 27248B */ | 200 | { "HWP1920" }, /* HP 27248B */ |
| 201 | { "HWP1940" }, /* HP J2577 */ | 201 | { "HWP1940" }, /* HP J2577 */ |
| @@ -336,7 +336,7 @@ static __devinit const char *hp100_read_id(int ioaddr) | |||
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | #ifdef CONFIG_ISA | 338 | #ifdef CONFIG_ISA |
| 339 | static __devinit int hp100_isa_probe1(struct net_device *dev, int ioaddr) | 339 | static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr) |
| 340 | { | 340 | { |
| 341 | const char *sig; | 341 | const char *sig; |
| 342 | int i; | 342 | int i; |
| @@ -372,7 +372,7 @@ static __devinit int hp100_isa_probe1(struct net_device *dev, int ioaddr) | |||
| 372 | * EISA and PCI are handled by device infrastructure. | 372 | * EISA and PCI are handled by device infrastructure. |
| 373 | */ | 373 | */ |
| 374 | 374 | ||
| 375 | static int __devinit hp100_isa_probe(struct net_device *dev, int addr) | 375 | static int __init hp100_isa_probe(struct net_device *dev, int addr) |
| 376 | { | 376 | { |
| 377 | int err = -ENODEV; | 377 | int err = -ENODEV; |
| 378 | 378 | ||
| @@ -396,7 +396,7 @@ static int __devinit hp100_isa_probe(struct net_device *dev, int addr) | |||
| 396 | #endif /* CONFIG_ISA */ | 396 | #endif /* CONFIG_ISA */ |
| 397 | 397 | ||
| 398 | #if !defined(MODULE) && defined(CONFIG_ISA) | 398 | #if !defined(MODULE) && defined(CONFIG_ISA) |
| 399 | struct net_device * __devinit hp100_probe(int unit) | 399 | struct net_device * __init hp100_probe(int unit) |
| 400 | { | 400 | { |
| 401 | struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private)); | 401 | struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private)); |
| 402 | int err; | 402 | int err; |
| @@ -2843,7 +2843,7 @@ static void cleanup_dev(struct net_device *d) | |||
| 2843 | } | 2843 | } |
| 2844 | 2844 | ||
| 2845 | #ifdef CONFIG_EISA | 2845 | #ifdef CONFIG_EISA |
| 2846 | static int __devinit hp100_eisa_probe (struct device *gendev) | 2846 | static int __init hp100_eisa_probe (struct device *gendev) |
| 2847 | { | 2847 | { |
| 2848 | struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private)); | 2848 | struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private)); |
| 2849 | struct eisa_device *edev = to_eisa_device(gendev); | 2849 | struct eisa_device *edev = to_eisa_device(gendev); |
