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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
jprobes.S
diff --git
a/arch/ia64/kernel/jprobes.S
b/arch/ia64/kernel/jprobes.S
index
6216302
..
f69389c
100644
(file)
--- a/
arch/ia64/kernel/jprobes.S
+++ b/
arch/ia64/kernel/jprobes.S
@@
-45,7
+45,7
@@
* to the correct location.
*/
#include <asm/asmmacro.h>
-#include <asm
-ia64
/break.h>
+#include <asm/break.h>
/*
* void jprobe_break(void)