diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 19:49:28 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 19:49:28 +0200 |
commit | 8065248069097dddf9945acfb2081025e9618c16 (patch) | |
tree | eddf3fb0372ba0f65c01382d386942ea8d18932d /arch/m68k/sun3/intersil.c | |
parent | rt2x00: do not generate seqno in h/w if QOS is disabled (diff) | |
parent | NFC: Fix the LLCP Tx fragmentation loop (diff) | |
download | linux-8065248069097dddf9945acfb2081025e9618c16.tar.xz linux-8065248069097dddf9945acfb2081025e9618c16.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'arch/m68k/sun3/intersil.c')
-rw-r--r-- | arch/m68k/sun3/intersil.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/sun3/intersil.c b/arch/m68k/sun3/intersil.c index 0116d208d300..94fe8016f1f0 100644 --- a/arch/m68k/sun3/intersil.c +++ b/arch/m68k/sun3/intersil.c @@ -14,7 +14,6 @@ #include <linux/rtc.h> #include <asm/errno.h> -#include <asm/system.h> #include <asm/rtc.h> #include <asm/intersil.h> |