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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
hardware.h
diff --git
a/arch/arm/plat-mxc/include/mach/hardware.h
b/arch/arm/plat-mxc/include/mach/hardware.h
index
42e4ee3
..
78db754
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/hardware.h
+++ b/
arch/arm/plat-mxc/include/mach/hardware.h
@@
-42,6
+42,14
@@
# include <mach/mx1.h>
#endif
+#ifdef CONFIG_ARCH_MX25
+# include <mach/mx25.h>
+#endif
+
+#ifdef CONFIG_ARCH_MXC91231
+# include <mach/mxc91231.h>
+#endif
+
#include <mach/mxc.h>
#endif /* __ASM_ARCH_MXC_HARDWARE_H__ */