git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel...
[pandora-kernel.git]
/
arch
/
sparc
/
include
/
asm
/
jump_label.h
diff --git
a/arch/sparc/include/asm/jump_label.h
b/arch/sparc/include/asm/jump_label.h
index
d95cf44
..
427d468
100644
(file)
--- a/
arch/sparc/include/asm/jump_label.h
+++ b/
arch/sparc/include/asm/jump_label.h
@@
-4,7
+4,6
@@
#ifdef __KERNEL__
#include <linux/types.h>
-#include <asm/system.h>
#define JUMP_LABEL_NOP_SIZE 4