diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /drivers/net/hp100.c | |
| parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/net/hp100.c')
| -rw-r--r-- | drivers/net/hp100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index 844c136e9920..7dc5185aa2c0 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c | |||
| @@ -3034,7 +3034,7 @@ static int __init hp100_module_init(void) | |||
| 3034 | goto out2; | 3034 | goto out2; |
| 3035 | #endif | 3035 | #endif |
| 3036 | #ifdef CONFIG_PCI | 3036 | #ifdef CONFIG_PCI |
| 3037 | err = pci_module_init(&hp100_pci_driver); | 3037 | err = pci_register_driver(&hp100_pci_driver); |
| 3038 | if (err && err != -ENODEV) | 3038 | if (err && err != -ENODEV) |
| 3039 | goto out3; | 3039 | goto out3; |
| 3040 | #endif | 3040 | #endif |