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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
bootx.h
diff --git
a/arch/powerpc/include/asm/bootx.h
b/arch/powerpc/include/asm/bootx.h
index
57b82e3
..
60a3c9e
100644
(file)
--- a/
arch/powerpc/include/asm/bootx.h
+++ b/
arch/powerpc/include/asm/bootx.h
@@
-9,7
+9,7
@@
#ifndef __ASM_BOOTX_H__
#define __ASM_BOOTX_H__
-#include <
asm
/types.h>
+#include <
linux
/types.h>
#ifdef macintosh
#include <Types.h>