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.39-rc6' into x86/cleanups
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
include
/
mach
/
zboot.h
diff --git
a/arch/arm/mach-shmobile/include/mach/zboot.h
b/arch/arm/mach-shmobile/include/mach/zboot.h
index
6d6a205
..
9320aff
100644
(file)
--- a/
arch/arm/mach-shmobile/include/mach/zboot.h
+++ b/
arch/arm/mach-shmobile/include/mach/zboot.h
@@
-13,7
+13,7
@@
#ifdef CONFIG_MACH_AP4EVB
#define MACH_TYPE MACH_TYPE_AP4EVB
#include "mach/head-ap4evb.txt"
-#elif
CONFIG_MACH_MACKEREL
+#elif
defined(CONFIG_MACH_MACKEREL)
#define MACH_TYPE MACH_TYPE_MACKEREL
#include "mach/head-mackerel.txt"
#else