diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 14:54:28 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 14:54:28 +0100 |
| commit | d4263348f796f29546f90802177865dd4379dd0a (patch) | |
| tree | adcbdaebae584eee2f32fab95e826e8e49eef385 /arch/sparc/kernel/process_32.c | |
| parent | Documentation: update URL to hfsplus Technote 1150 (diff) | |
| parent | Linux 3.14-rc3 (diff) | |
| download | linux-d4263348f796f29546f90802177865dd4379dd0a.tar.xz linux-d4263348f796f29546f90802177865dd4379dd0a.zip | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/sparc/kernel/process_32.c')
| -rw-r--r-- | arch/sparc/kernel/process_32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c index fdd819dfdacf..510baec1b69b 100644 --- a/arch/sparc/kernel/process_32.c +++ b/arch/sparc/kernel/process_32.c @@ -22,7 +22,6 @@ #include <linux/reboot.h> #include <linux/delay.h> #include <linux/pm.h> -#include <linux/init.h> #include <linux/slab.h> #include <asm/auxio.h> |