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' into for-next
[pandora-kernel.git]
/
arch
/
m68k
/
include
/
asm
/
mcfsim.h
diff --git
a/arch/m68k/include/asm/mcfsim.h
b/arch/m68k/include/asm/mcfsim.h
index
6901fd6
..
ebd0304
100644
(file)
--- a/
arch/m68k/include/asm/mcfsim.h
+++ b/
arch/m68k/include/asm/mcfsim.h
@@
-41,8
+41,8
@@
#elif defined(CONFIG_M5407)
#include <asm/m5407sim.h>
#include <asm/mcfintc.h>
#elif defined(CONFIG_M5407)
#include <asm/m5407sim.h>
#include <asm/mcfintc.h>
-#elif defined(CONFIG_M54
8
x)
-#include <asm/m54
8
xsim.h>
+#elif defined(CONFIG_M54
x
x)
+#include <asm/m54
x
xsim.h>
#endif
/****************************************************************************/
#endif
/****************************************************************************/