projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'from-linus' into upstream
[powerpc.git]
/
drivers
/
net
/
tulip
/
xircom_cb.c
diff --git
a/drivers/net/tulip/xircom_cb.c
b/drivers/net/tulip/xircom_cb.c
index
f874e4f
..
cf43390
100644
(file)
--- a/
drivers/net/tulip/xircom_cb.c
+++ b/
drivers/net/tulip/xircom_cb.c
@@
-1264,8
+1264,7
@@
static void investigate_write_descriptor(struct net_device *dev, struct xircom_p
static int __init xircom_init(void)
{
- pci_register_driver(&xircom_ops);
- return 0;
+ return pci_register_driver(&xircom_ops);
}
static void __exit xircom_exit(void)