diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 18:07:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 18:07:52 -0800 |
| commit | 19ba20f455a8e9cf15c12891e751fd73c9026292 (patch) | |
| tree | 7d3322f1170859a2abef4c7fcfeb523266ab73a5 /arch/sparc/kernel/trampoline_64.S | |
| parent | 3308ee8f4582f97d1c08864dd06f7291aea323e5 (diff) | |
| parent | a54983ae64b12cf7e098c464c7eaf058752bc9cc (diff) | |
| download | talos-obmc-linux-19ba20f455a8e9cf15c12891e751fd73c9026292.tar.gz talos-obmc-linux-19ba20f455a8e9cf15c12891e751fd73c9026292.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc update from David Miller:
"Two cleanups from Paul Gortmaker and hook up the new scheduler system
calls"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: Hook up sched_setattr and sched_getattr syscalls.
sparc: don't use module_init in non-modular pci.c code
sparc: delete non-required instances of include <linux/init.h>
Diffstat (limited to 'arch/sparc/kernel/trampoline_64.S')
| -rw-r--r-- | arch/sparc/kernel/trampoline_64.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/kernel/trampoline_64.S b/arch/sparc/kernel/trampoline_64.S index ad4bde3bb61e..737f8cbc7d56 100644 --- a/arch/sparc/kernel/trampoline_64.S +++ b/arch/sparc/kernel/trampoline_64.S @@ -4,7 +4,6 @@ * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) */ -#include <linux/init.h> #include <asm/head.h> #include <asm/asi.h> |
