Merge commit 'v3.4-rc4' into next

[~andy/linux] / net / rose / rose_timer.c

diff --git a/net/rose/rose_timer.c b/net/rose/rose_timer.c
index b6c8f38cc26c42025ea9b6c63558f2d032c1f92d..bc5469d6d9cb5cdf6e7995e3ee605f97d2dd2616 100644 (file)
--- a/net/rose/rose_timer.c
+++ b/net/rose/rose_timer.c
@@ -23,7 +23,6 @@
 #include <linux/skbuff.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
-#include <asm/system.h>
 #include <linux/fcntl.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>