diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 10:51:07 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 10:51:07 +0100 |
commit | 0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4 (patch) | |
tree | d2ca69347816c27f9dc352581f5d0fe76811cd49 /arch/sparc/kernel/unaligned_32.c | |
parent | Input: elantech - add resolution query support for v4 hardware (diff) | |
parent | Linux 3.2-rc3 (diff) | |
download | linux-0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4.tar.xz linux-0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4.zip |
Merge commit 'v3.2-rc3' into next
Diffstat (limited to 'arch/sparc/kernel/unaligned_32.c')
-rw-r--r-- | arch/sparc/kernel/unaligned_32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/kernel/unaligned_32.c b/arch/sparc/kernel/unaligned_32.c index 7efbb2f9e77f..4d043a1b2492 100644 --- a/arch/sparc/kernel/unaligned_32.c +++ b/arch/sparc/kernel/unaligned_32.c @@ -10,7 +10,6 @@ #include <linux/kernel.h> #include <linux/sched.h> #include <linux/mm.h> -#include <linux/module.h> #include <asm/ptrace.h> #include <asm/processor.h> #include <asm/system.h> |