Merge branches 'x86/cleanups', 'x86/fpu' and 'x86/urgent' into x86/core

[linux-2.6-omap-h63xx.git] / net / irda / timer.c

diff --git a/net/irda/timer.c b/net/irda/timer.c
index d730099080a28acabb81957840c11e5be7e10445..0335ba0cc5939d19d317563a3ffad6bcca1e0b2d 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;