git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/docs-next' into v4l_for_linus
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
include
/
asm
/
jump_label.h
diff --git
a/arch/s390/include/asm/jump_label.h
b/arch/s390/include/asm/jump_label.h
index 7f9fd5e3f1bff6b7afe0994232eae95a6680b886..9be198f5ee79213bd1cf48f53991121bdf12785a 100644
(file)
--- a/
arch/s390/include/asm/jump_label.h
+++ b/
arch/s390/include/asm/jump_label.h
@@
-4,6
+4,7
@@
#ifndef __ASSEMBLY__
#include <linux/types.h>
+#include <linux/stringify.h>
#define JUMP_LABEL_NOP_SIZE 6
#define JUMP_LABEL_NOP_OFFSET 2