Merge git://git.infradead.org/battery-2.6

[linux-2.6] / net / irda / irlan / irlan_event.c

diff --git a/net/irda/irlan/irlan_event.c b/net/irda/irlan/irlan_event.c
index a9750a801388f6d2586852f81a9c8ca980f7582f..cbcb4eb54037bb71db6ddd8cb5cf03118509c499 100644 (file)
--- a/net/irda/irlan/irlan_event.c
+++ b/net/irda/irlan/irlan_event.c
@@ -40,7 +40,7 @@ char *irlan_state[] = {
 
 void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
 {
-       IRDA_DEBUG(2, "%s(), %s\n", __FUNCTION__ , irlan_state[state]);
+       IRDA_DEBUG(2, "%s(), %s\n", __func__ , irlan_state[state]);
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -50,7 +50,7 @@ void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
 
 void irlan_next_provider_state(struct irlan_cb *self, IRLAN_STATE state)
 {
-       IRDA_DEBUG(2, "%s(), %s\n", __FUNCTION__ , irlan_state[state]);
+       IRDA_DEBUG(2, "%s(), %s\n", __func__ , irlan_state[state]);
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);