diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-20 11:58:09 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-20 11:58:09 -0500 |
| commit | fd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (patch) | |
| tree | 5886a08bfa1132058b06074f4666a36dc5ddd2a1 /drivers/net/de620.c | |
| parent | 88274815f7477dc7550439413ab87c5ce4c5a623 (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/net/de620.c')
| -rw-r--r-- | drivers/net/de620.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/de620.c b/drivers/net/de620.c index 0069f5fa973a..22fc5b869a60 100644 --- a/drivers/net/de620.c +++ b/drivers/net/de620.c | |||
| @@ -1012,7 +1012,7 @@ static int __init read_eeprom(struct net_device *dev) | |||
| 1012 | #ifdef MODULE | 1012 | #ifdef MODULE |
| 1013 | static struct net_device *de620_dev; | 1013 | static struct net_device *de620_dev; |
| 1014 | 1014 | ||
| 1015 | int init_module(void) | 1015 | int __init init_module(void) |
| 1016 | { | 1016 | { |
| 1017 | de620_dev = de620_probe(-1); | 1017 | de620_dev = de620_probe(-1); |
| 1018 | if (IS_ERR(de620_dev)) | 1018 | if (IS_ERR(de620_dev)) |