git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iwlwifi: move iwl_print_hex_dump to iwl-debug.h
[safe/jmp/linux-2.6]
/
drivers
/
net
/
apne.c
diff --git
a/drivers/net/apne.c
b/drivers/net/apne.c
index
b5a974a
..
7426f69
100644
(file)
--- a/
drivers/net/apne.c
+++ b/
drivers/net/apne.c
@@
-127,6
+127,9
@@
struct net_device * __init apne_probe(int unit)
#endif
int err;
#endif
int err;
+ if (!MACH_IS_AMIGA)
+ return ERR_PTR(-ENODEV);
+
if (apne_owned)
return ERR_PTR(-ENODEV);
if (apne_owned)
return ERR_PTR(-ENODEV);
@@
-316,12
+319,12
@@
static int __init apne_probe1(struct net_device *dev, int ioaddr)
i = request_irq(dev->irq, apne_interrupt, IRQF_SHARED, DRV_NAME, dev);
if (i) return i;
i = request_irq(dev->irq, apne_interrupt, IRQF_SHARED, DRV_NAME, dev);
if (i) return i;
- for(i = 0; i < ETHER_ADDR_LEN; i++) {
- printk(" %2.2x", SA_prom[i]);
+ for(i = 0; i < ETHER_ADDR_LEN; i++)
dev->dev_addr[i] = SA_prom[i];
dev->dev_addr[i] = SA_prom[i];
- }
- printk("\n%s: %s found.\n", dev->name, name);
+ printk(" %pM\n", dev->dev_addr);
+
+ printk("%s: %s found.\n", dev->name, name);
ei_status.name = name;
ei_status.tx_start_page = start_page;
ei_status.name = name;
ei_status.tx_start_page = start_page;
@@
-568,7
+571,7
@@
static irqreturn_t apne_interrupt(int irq, void *dev_id)
#ifdef MODULE
static struct net_device *apne_dev;
#ifdef MODULE
static struct net_device *apne_dev;
-
int __init init_module
(void)
+
static int __init apne_module_init
(void)
{
apne_dev = apne_probe(-1);
if (IS_ERR(apne_dev))
{
apne_dev = apne_probe(-1);
if (IS_ERR(apne_dev))
@@
-576,7
+579,7
@@
int __init init_module(void)
return 0;
}
return 0;
}
-
void __exit cleanup_module
(void)
+
static void __exit apne_module_exit
(void)
{
unregister_netdev(apne_dev);
{
unregister_netdev(apne_dev);
@@
-590,7
+593,8
@@
void __exit cleanup_module(void)
free_netdev(apne_dev);
}
free_netdev(apne_dev);
}
-
+module_init(apne_module_init);
+module_exit(apne_module_exit);
#endif
static int init_pcmcia(void)
#endif
static int init_pcmcia(void)