Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[pandora-kernel.git] / net / irda / irmod.c

diff --git a/net/irda/irmod.c b/net/irda/irmod.c
index 1900937..4c487a8 100644 (file)
--- a/net/irda/irmod.c
+++ b/net/irda/irmod.c
@@ -17,7 +17,7 @@
  *     published by the Free Software Foundation; either version 2 of
  *     the License, or (at your option) any later version.
  *
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
  *     provide warranty for any of this software. This material is
  *     provided "AS-IS" and at no charge.
  *
@@ -90,7 +90,7 @@ static int __init irda_init(void)
 {
        int ret = 0;
 
-       IRDA_DEBUG(0, "%s()\n", __FUNCTION__);
+       IRDA_DEBUG(0, "%s()\n", __func__);
 
        /* Lower layer of the stack */
        irlmp_init();
@@ -128,8 +128,8 @@ static int __init irda_init(void)
  out_err_3:
 #ifdef CONFIG_SYSCTL
        irda_sysctl_unregister();
-#endif
  out_err_2:
+#endif
 #ifdef CONFIG_PROC_FS
        irda_proc_unregister();
 #endif