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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
include
/
plat
/
io.h
diff --git
a/arch/arm/plat-omap/include/plat/io.h
b/arch/arm/plat-omap/include/plat/io.h
index
ef4106c
..
d72ec85
100644
(file)
--- a/
arch/arm/plat-omap/include/plat/io.h
+++ b/
arch/arm/plat-omap/include/plat/io.h
@@
-259,7
+259,7
@@
struct omap_sdrc_params;
extern void omap1_map_common_io(void);
extern void omap1_init_common_hw(void);
extern void omap1_map_common_io(void);
extern void omap1_init_common_hw(void);
-#ifdef CONFIG_
ARCH
_OMAP2420
+#ifdef CONFIG_
SOC
_OMAP2420
extern void omap242x_map_common_io(void);
#else
static inline void omap242x_map_common_io(void)
extern void omap242x_map_common_io(void);
#else
static inline void omap242x_map_common_io(void)
@@
-267,7
+267,7
@@
static inline void omap242x_map_common_io(void)
}
#endif
}
#endif
-#ifdef CONFIG_
ARCH
_OMAP2430
+#ifdef CONFIG_
SOC
_OMAP2430
extern void omap243x_map_common_io(void);
#else
static inline void omap243x_map_common_io(void)
extern void omap243x_map_common_io(void);
#else
static inline void omap243x_map_common_io(void)
@@
-283,6
+283,14
@@
static inline void omap34xx_map_common_io(void)
}
#endif
}
#endif
+#ifdef CONFIG_SOC_OMAPTI816X
+extern void omapti816x_map_common_io(void);
+#else
+static inline void omapti816x_map_common_io(void)
+{
+}
+#endif
+
#ifdef CONFIG_ARCH_OMAP4
extern void omap44xx_map_common_io(void);
#else
#ifdef CONFIG_ARCH_OMAP4
extern void omap44xx_map_common_io(void);
#else