diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-01 09:02:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-01 09:02:26 +0100 |
| commit | 0871d5a66da5c41151e0896a90298b163e42f2e0 (patch) | |
| tree | 1ba71fab9016cb28bb9d18ffd62b6b744f2f761c /arch/mips/ar7/memory.c | |
| parent | e22af0be2cf654bb225f19750c6b9aab1627dc9e (diff) | |
| parent | 2d6be4abf514fc26c83d239c7f31da1f95e4a31d (diff) | |
| download | blackbird-obmc-linux-0871d5a66da5c41151e0896a90298b163e42f2e0.tar.gz blackbird-obmc-linux-0871d5a66da5c41151e0896a90298b163e42f2e0.zip | |
Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates
Conflicts:
arch/x86/xen/setup.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/ar7/memory.c')
| -rw-r--r-- | arch/mips/ar7/memory.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c index 92dfa481205b..0332f0514d05 100644 --- a/arch/mips/ar7/memory.c +++ b/arch/mips/ar7/memory.c @@ -19,7 +19,6 @@ #include <linux/bootmem.h> #include <linux/init.h> #include <linux/mm.h> -#include <linux/module.h> #include <linux/pfn.h> #include <linux/proc_fs.h> #include <linux/string.h> |
