diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
| commit | 75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d (patch) | |
| tree | c2f02ee30609d0d69308b4ca80d68d02a5f85552 /drivers/net/ne.c | |
| parent | 0fd1ffe0633b4b039b343b753598e6df435e034d (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/ne.c')
| -rw-r--r-- | drivers/net/ne.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ne.c b/drivers/net/ne.c index b32765215f75..963a11fa9fe2 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c | |||
| @@ -829,7 +829,7 @@ that the ne2k probe is the last 8390 based probe to take place (as it | |||
| 829 | is at boot) and so the probe will get confused by any other 8390 cards. | 829 | is at boot) and so the probe will get confused by any other 8390 cards. |
| 830 | ISA device autoprobes on a running machine are not recommended anyway. */ | 830 | ISA device autoprobes on a running machine are not recommended anyway. */ |
| 831 | 831 | ||
| 832 | int init_module(void) | 832 | int __init init_module(void) |
| 833 | { | 833 | { |
| 834 | int this_dev, found = 0; | 834 | int this_dev, found = 0; |
| 835 | 835 | ||