diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /drivers/net/sb1250-mac.c | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'drivers/net/sb1250-mac.c')
| -rw-r--r-- | drivers/net/sb1250-mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index db2324939b69..1eae16b72b4b 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
| @@ -2903,7 +2903,7 @@ sbmac_init_module(void) | |||
| 2903 | 2903 | ||
| 2904 | dev = alloc_etherdev(sizeof(struct sbmac_softc)); | 2904 | dev = alloc_etherdev(sizeof(struct sbmac_softc)); |
| 2905 | if (!dev) | 2905 | if (!dev) |
| 2906 | return -ENOMEM; /* return ENOMEM */ | 2906 | return -ENOMEM; |
| 2907 | 2907 | ||
| 2908 | printk(KERN_DEBUG "sbmac: configuring MAC at %lx\n", port); | 2908 | printk(KERN_DEBUG "sbmac: configuring MAC at %lx\n", port); |
| 2909 | 2909 | ||