Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

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

diff --git a/net/irda/timer.c b/net/irda/timer.c
index d730099..0335ba0 100644 (file)
--- a/net/irda/timer.c
+++ b/net/irda/timer.c
@@ -219,7 +219,7 @@ static void irlap_backoff_timer_expired(void *data)
  *
  *
  */
-void irlap_media_busy_expired(void* data)
+static void irlap_media_busy_expired(void *data)
 {
        struct irlap_cb *self = (struct irlap_cb *) data;