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/sparc-2.6
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
cputype.h
diff --git
a/arch/arm/include/asm/cputype.h
b/arch/arm/include/asm/cputype.h
index
ed5bc9e
..
cd4458f
100644
(file)
--- a/
arch/arm/include/asm/cputype.h
+++ b/
arch/arm/include/asm/cputype.h
@@
-2,6
+2,7
@@
#define __ASM_ARM_CPUTYPE_H
#include <linux/stringify.h>
+#include <linux/kernel.h>
#define CPUID_ID 0
#define CPUID_CACHETYPE 1