diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
| commit | 98174e46974323e4941c72e46345f7277755e146 (patch) | |
| tree | c4644c8f38a519cfb3929d1175fc7107eefe48b9 /drivers/net/hp-plus.c | |
| parent | d8ce75324135ea7100124c1fff4ec5090a350607 (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge HEAD from ../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 0d7a6250e346..e26a3e407d70 100644 --- a/drivers/net/hp-plus.c +++ b/drivers/net/hp-plus.c | |||
| @@ -446,7 +446,7 @@ MODULE_LICENSE("GPL"); | |||
| 446 | 446 | ||
| 447 | /* This is set up so that only a single autoprobe takes place per call. | 447 | /* This is set up so that only a single autoprobe takes place per call. |
| 448 | ISA device autoprobes on a running machine are not recommended. */ | 448 | ISA device autoprobes on a running machine are not recommended. */ |
| 449 | int | 449 | int __init |
| 450 | init_module(void) | 450 | init_module(void) |
| 451 | { | 451 | { |
| 452 | struct net_device *dev; | 452 | struct net_device *dev; |