diff options
| author | Auke Kok <auke-jan.h.kok@intel.com> | 2006-06-21 16:43:50 -0400 |
|---|---|---|
| committer | Auke-jan Kok <ahkok@gitlost.site> | 2006-06-21 16:43:50 -0400 |
| commit | 0d204094d15dac2e8a439b993f71eda385b4dccd (patch) | |
| tree | 647f0ddec94d0fb4aaf74fa55bcad75946030f8a /drivers/net/3c527.c | |
| parent | a487a8f7b6947f6445e5a1aa876522916785d5ec (diff) | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/3c527.c')
| -rw-r--r-- | drivers/net/3c527.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c index 6db3301e7965..1b1cb0026072 100644 --- a/drivers/net/3c527.c +++ b/drivers/net/3c527.c | |||
| @@ -1646,7 +1646,7 @@ static struct net_device *this_device; | |||
| 1646 | * insmod multiple modules for now but it's a hack. | 1646 | * insmod multiple modules for now but it's a hack. |
| 1647 | */ | 1647 | */ |
| 1648 | 1648 | ||
| 1649 | int init_module(void) | 1649 | int __init init_module(void) |
| 1650 | { | 1650 | { |
| 1651 | this_device = mc32_probe(-1); | 1651 | this_device = mc32_probe(-1); |
| 1652 | if (IS_ERR(this_device)) | 1652 | if (IS_ERR(this_device)) |