diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 22:17:37 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 22:17:37 -0500 |
| commit | 06d8bf64ba25db42fcc60d2da2268ac22af94e77 (patch) | |
| tree | eb80eebf368957df18c2a4c0ee02897e0a9b06d2 /drivers/net/hp100.c | |
| parent | 8f68abbfd9703e58920ff07d314a48654ed0bc3b (diff) | |
| parent | 5986a2ec35836a878350c54af4bd91b1de6abc59 (diff) | |
Merge branch 'master' into for_paulus
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 |