git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
tokenring
/
3c359.c
diff --git
a/drivers/net/tokenring/3c359.c
b/drivers/net/tokenring/3c359.c
index
465921e
..
412390b
100644
(file)
--- a/
drivers/net/tokenring/3c359.c
+++ b/
drivers/net/tokenring/3c359.c
@@
-1815,7
+1815,7
@@
static struct pci_driver xl_3c359_driver = {
static int __init xl_pci_init (void)
{
- return pci_
module_init
(&xl_3c359_driver);
+ return pci_
register_driver
(&xl_3c359_driver);
}