Merge branch 'io-mappings-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / drivers / net / irda / ks959-sir.c

diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index 407afba1a5971be1bafbeabc0bdd5fca248617f6..2e67ae015d916eae51ca1a2ceb666b7b6905e5a7 100644 (file)
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -118,7 +118,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/kref.h>
 #include <linux/usb.h>
 #include <linux/device.h>
@@ -697,7 +696,6 @@ static int ks959_probe(struct usb_interface *intf,
        if (!net)
                goto err_out1;
 
-       SET_MODULE_OWNER(net);
        SET_NETDEV_DEV(net, &intf->dev);
        kingsun = netdev_priv(net);
        kingsun->netdev = net;
@@ -802,7 +800,8 @@ static int ks959_probe(struct usb_interface *intf,
        if (ret != 0)
                goto free_mem;
 
-       info("IrDA: Registered KingSun KS-959 device %s", net->name);
+       dev_info(&net->dev, "IrDA: Registered KingSun KS-959 device %s\n",
+                net->name);
 
        usb_set_intfdata(intf, kingsun);