Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / net / ax25 / ax25_std_timer.c

diff --git a/net/ax25/ax25_std_timer.c b/net/ax25/ax25_std_timer.c
index a29c480a4dc1f992f7f339c44f4b3d0ca9184526..f2f6918ac9bb69cae0c93f084b5955aed97f460c 100644 (file)
--- a/net/ax25/ax25_std_timer.c
+++ b/net/ax25/ax25_std_timer.c
@@ -14,7 +14,6 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>
@@ -34,7 +33,7 @@
 void ax25_std_heartbeat_expiry(ax25_cb *ax25)
 {
        struct sock *sk=ax25->sk;
-       
+
        if (sk)
                bh_lock_sock(sk);