git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
net
/
wireless
/
orinoco_nortel.c
diff --git
a/drivers/net/wireless/orinoco_nortel.c
b/drivers/net/wireless/orinoco_nortel.c
index
bf05b90
..
eaf3d13
100644
(file)
--- a/
drivers/net/wireless/orinoco_nortel.c
+++ b/
drivers/net/wireless/orinoco_nortel.c
@@
-304,7
+304,7
@@
MODULE_LICENSE("Dual MPL/GPL");
static int __init orinoco_nortel_init(void)
{
printk(KERN_DEBUG "%s\n", version);
- return pci_
module_init
(&orinoco_nortel_driver);
+ return pci_
register_driver
(&orinoco_nortel_driver);
}
static void __exit orinoco_nortel_exit(void)