diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2011-08-04 16:13:20 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-08-04 16:13:20 -0700 |
| commit | 17b0436077d99211d8b26886235a36c5ec54ac57 (patch) | |
| tree | 8bcd9b4a0f8285f749814e95ae0365c611ba2392 /drivers/net/hplance.c | |
| parent | aafade242ff24fac3aabf61c7861dfa44a3c2445 (diff) | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
Merge commit 'v3.0' into x86/vdso
Diffstat (limited to 'drivers/net/hplance.c')
| -rw-r--r-- | drivers/net/hplance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hplance.c b/drivers/net/hplance.c index b6060f7538df..a900d5bf2948 100644 --- a/drivers/net/hplance.c +++ b/drivers/net/hplance.c @@ -135,7 +135,7 @@ static void __devexit hplance_remove_one(struct dio_dev *d) } /* Initialise a single lance board at the given DIO device */ -static void __init hplance_init(struct net_device *dev, struct dio_dev *d) +static void __devinit hplance_init(struct net_device *dev, struct dio_dev *d) { unsigned long va = (d->resource.start + DIO_VIRADDRBASE); struct hplance_private *lp; |