Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

[pandora-kernel.git] / net / ax25 / ax25_ds_in.c

diff --git a/net/ax25/ax25_ds_in.c b/net/ax25/ax25_ds_in.c
index 5d0f8fb..8273b12 100644 (file)
--- a/net/ax25/ax25_ds_in.c
+++ b/net/ax25/ax25_ds_in.c
@@ -12,7 +12,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>
@@ -22,7 +21,6 @@
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
-#include <net/ip.h>                    /* For ip_rcv */
 #include <net/tcp_states.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -77,7 +75,7 @@ static int ax25_ds_state1_machine(ax25_cb *ax25, struct sk_buff *skb, int framet
                }
                ax25_dama_on(ax25);
 
-               /* according to DK4EG´s spec we are required to
+               /* according to DK4EG's spec we are required to
                 * send a RR RESPONSE FINAL NR=0.
                 */