diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-03-10 15:17:26 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-03-10 15:17:26 +0900 |
| commit | e161183ba674f97fce748384f5bb037d07bdc5c9 (patch) | |
| tree | 5b3bd4b995f6435ee977b71082244fa1a647f717 /drivers/net/hp-plus.c | |
| parent | 2ef7f0dab6b3d171b6aff00a47077385ae3155b5 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/hp-plus.c')
| -rw-r--r-- | drivers/net/hp-plus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c index 5e070f44663..0486cbe01ad 100644 --- a/drivers/net/hp-plus.c +++ b/drivers/net/hp-plus.c @@ -467,7 +467,7 @@ init_module(void) if (this_dev != 0) break; /* only autoprobe 1st one */ printk(KERN_NOTICE "hp-plus.c: Presently autoprobing (not recommended) for a single card.\n"); } - dev = alloc_ei_netdev(); + dev = alloc_eip_netdev(); if (!dev) break; dev->irq = irq[this_dev]; |