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 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
include
/
mach
/
mmc.h
diff --git
a/arch/arm/mach-shmobile/include/mach/mmc.h
b/arch/arm/mach-shmobile/include/mach/mmc.h
index
e11560a
..
21a59db
100644
(file)
--- a/
arch/arm/mach-shmobile/include/mach/mmc.h
+++ b/
arch/arm/mach-shmobile/include/mach/mmc.h
@@
-9,7
+9,7
@@
#ifdef CONFIG_MACH_AP4EVB
#include "mach/mmc-ap4eb.h"
#ifdef CONFIG_MACH_AP4EVB
#include "mach/mmc-ap4eb.h"
-#elif
CONFIG_MACH_MACKEREL
+#elif
defined(CONFIG_MACH_MACKEREL)
#include "mach/mmc-mackerel.h"
#else
#error "unsupported board."
#include "mach/mmc-mackerel.h"
#else
#error "unsupported board."