diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-11-09 20:49:23 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 20:49:23 +0100 |
commit | 5e819059a20b0fc5a71875f28b4cae359e38d85a (patch) | |
tree | b94a18142abc5e60c84f90ee2490e8a6af01c2a9 /arch/x86/mm/mmio-mod.c | |
parent | mac80211: allow frame aggregation for mesh (diff) | |
parent | wl12xx: fix wl12xx_scan_sched_scan_ssid_list() check that all given ssids are... (diff) | |
download | linux-5e819059a20b0fc5a71875f28b4cae359e38d85a.tar.xz linux-5e819059a20b0fc5a71875f28b4cae359e38d85a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'arch/x86/mm/mmio-mod.c')
-rw-r--r-- | arch/x86/mm/mmio-mod.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c index 67421f38a215..de54b9b278a7 100644 --- a/arch/x86/mm/mmio-mod.c +++ b/arch/x86/mm/mmio-mod.c @@ -29,7 +29,6 @@ #include <linux/slab.h> #include <linux/uaccess.h> #include <linux/io.h> -#include <linux/version.h> #include <linux/kallsyms.h> #include <asm/pgtable.h> #include <linux/mmiotrace.h> |