summaryrefslogtreecommitdiffstats
path: root/net/802/hippi.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-04-12 19:49:28 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-04-12 19:49:28 +0200
commit8065248069097dddf9945acfb2081025e9618c16 (patch)
treeeddf3fb0372ba0f65c01382d386942ea8d18932d /net/802/hippi.c
parentrt2x00: do not generate seqno in h/w if QOS is disabled (diff)
parentNFC: Fix the LLCP Tx fragmentation loop (diff)
downloadlinux-8065248069097dddf9945acfb2081025e9618c16.tar.xz
linux-8065248069097dddf9945acfb2081025e9618c16.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/802/hippi.c')
-rw-r--r--net/802/hippi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/802/hippi.c b/net/802/hippi.c
index 91aca8780fd0..056794e66375 100644
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -35,7 +35,6 @@
#include <net/arp.h>
#include <net/sock.h>
#include <asm/uaccess.h>
-#include <asm/system.h>
/*
* Create the HIPPI MAC header for an arbitrary protocol layer