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 branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
io.h
diff --git
a/arch/powerpc/boot/io.h
b/arch/powerpc/boot/io.h
index
ccaedae
..
7c09f48
100644
(file)
--- a/
arch/powerpc/boot/io.h
+++ b/
arch/powerpc/boot/io.h
@@
-6,7
+6,7
@@
/*
* Low-level I/O routines.
*
- * Copied from <file:
include/asm-powerpc
/io.h> (which has no copyright)
+ * Copied from <file:
arch/powerpc/include/asm
/io.h> (which has no copyright)
*/
static inline int in_8(const volatile unsigned char *addr)
{