Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core

[firefly-linux-kernel-4.4.55.git] / drivers / net / ne.c

diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index cb02698d1286d606ba52b0b2fc63cce06ca41b1a..992dbfffdb05ece983205f5ffe71d5e6073af208 100644 (file)
--- a/drivers/net/ne.c
+++ b/drivers/net/ne.c
@@ -321,7 +321,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
        }
 
        if (ei_debug  &&  version_printed++ == 0)
-               printk(KERN_INFO "%s" KERN_INFO "%s", version1, version2);
+               printk(KERN_INFO "%s%s", version1, version2);
 
        printk(KERN_INFO "NE*000 ethercard probe at %#3lx:", ioaddr);
 
@@ -929,7 +929,7 @@ static void __init ne_add_devices(void)
 }
 
 #ifdef MODULE
-int __init init_module()
+int __init init_module(void)
 {
        int retval;
        ne_add_devices();