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

[sfrench/cifs-2.6.git] / net / irda / irqueue.c

diff --git a/net/irda/irqueue.c b/net/irda/irqueue.c
index 40c28efaed9552c788cf968e96c57449d3849004..849aaf0dabb5ec8a1be02ab471a84d6d736b5f06 100644 (file)
--- a/net/irda/irqueue.c
+++ b/net/irda/irqueue.c
@@ -192,6 +192,7 @@
  * Jean II
  */
 #include <linux/module.h>
+#include <linux/slab.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irqueue.h>
@@ -232,7 +233,7 @@ static __u32 hash( const char* name)
 static void enqueue_first(irda_queue_t **queue, irda_queue_t* element)
 {
 
-       IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);
+       IRDA_DEBUG( 4, "%s()\n", __func__);
 
        /*
         * Check if queue is empty.
@@ -451,7 +452,7 @@ void hashbin_insert(hashbin_t* hashbin, irda_queue_t* entry, long hashv,
        unsigned long flags = 0;
        int bin;
 
-       IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);
+       IRDA_DEBUG( 4, "%s()\n", __func__);
 
        IRDA_ASSERT( hashbin != NULL, return;);
        IRDA_ASSERT( hashbin->magic == HB_MAGIC, return;);
@@ -564,7 +565,7 @@ void* hashbin_remove( hashbin_t* hashbin, long hashv, const char* name)
        unsigned long flags = 0;
        irda_queue_t* entry;
 
-       IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);
+       IRDA_DEBUG( 4, "%s()\n", __func__);
 
        IRDA_ASSERT( hashbin != NULL, return NULL;);
        IRDA_ASSERT( hashbin->magic == HB_MAGIC, return NULL;);
@@ -657,7 +658,7 @@ void* hashbin_remove_this( hashbin_t* hashbin, irda_queue_t* entry)
        int     bin;
        long    hashv;
 
-       IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);
+       IRDA_DEBUG( 4, "%s()\n", __func__);
 
        IRDA_ASSERT( hashbin != NULL, return NULL;);
        IRDA_ASSERT( hashbin->magic == HB_MAGIC, return NULL;);