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 commit 'v2.6.26-rc9' into sched/devel
[pandora-kernel.git]
/
include
/
asm-powerpc
/
shmparam.h
diff --git
a/include/asm-powerpc/shmparam.h
b/include/asm-powerpc/shmparam.h
index
d625060
..
5cda42a
100644
(file)
--- a/
include/asm-powerpc/shmparam.h
+++ b/
include/asm-powerpc/shmparam.h
@@
-1,6
+1,6
@@
-#ifndef _
P
PC_SHMPARAM_H
-#define _
P
PC_SHMPARAM_H
+#ifndef _
ASM_POWER
PC_SHMPARAM_H
+#define _
ASM_POWER
PC_SHMPARAM_H
#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */
-#endif /* _
P
PC_SHMPARAM_H */
+#endif /* _
ASM_POWER
PC_SHMPARAM_H */