Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[pandora-kernel.git] / drivers / net / irda / sir_dongle.c

diff --git a/drivers/net/irda/sir_dongle.c b/drivers/net/irda/sir_dongle.c
index d7e32d9..3603024 100644 (file)
--- a/drivers/net/irda/sir_dongle.c
+++ b/drivers/net/irda/sir_dongle.c
@@ -14,7 +14,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/kmod.h>
 #include <linux/mutex.h>
 
@@ -37,7 +36,7 @@ int irda_register_dongle(struct dongle_driver *new)
        struct dongle_driver *drv;
 
        IRDA_DEBUG(0, "%s : registering dongle \"%s\" (%d).\n",
-                  __FUNCTION__, new->driver_name, new->type);
+                  __func__, new->driver_name, new->type);
 
        mutex_lock(&dongle_list_lock);
        list_for_each(entry, &dongle_list) {