upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / drivers / net / dgrs.c

diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c
index c496ebf..779af17 100644 (file)
--- a/drivers/net/dgrs.c
+++ b/drivers/net/dgrs.c
@@ -97,8 +97,8 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
@@ -1597,10 +1597,10 @@ static int __init dgrs_init_module (void)
 #endif
 #ifdef CONFIG_PCI
        pcicount = pci_register_driver(&dgrs_pci_driver);
-       if (pcicount < 0)
+       if (pcicount)
                return pcicount;
 #endif
-       return (eisacount + pcicount) == 0 ? -ENODEV : 0;
+       return 0;
 }
 
 static void __exit dgrs_cleanup_module (void)