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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-s3c24xx
/
include
/
plat
/
s3c244x.h
diff --git
a/arch/arm/plat-s3c24xx/include/plat/s3c244x.h
b/arch/arm/plat-s3c24xx/include/plat/s3c244x.h
index
307248d
..
89e8d0a
100644
(file)
--- a/
arch/arm/plat-s3c24xx/include/plat/s3c244x.h
+++ b/
arch/arm/plat-s3c24xx/include/plat/s3c244x.h
@@
-21,17
+21,22
@@
extern void s3c244x_init_clocks(int xtal);
#else
#define s3c244x_init_clocks NULL
#define s3c244x_init_uarts NULL
#else
#define s3c244x_init_clocks NULL
#define s3c244x_init_uarts NULL
-#define s3c244x_map_io NULL
#endif
#ifdef CONFIG_CPU_S3C2440
extern int s3c2440_init(void);
#endif
#ifdef CONFIG_CPU_S3C2440
extern int s3c2440_init(void);
+
+extern void s3c2440_map_io(void);
#else
#define s3c2440_init NULL
#else
#define s3c2440_init NULL
+#define s3c2440_map_io NULL
#endif
#ifdef CONFIG_CPU_S3C2442
extern int s3c2442_init(void);
#endif
#ifdef CONFIG_CPU_S3C2442
extern int s3c2442_init(void);
+
+extern void s3c2442_map_io(void);
#else
#define s3c2442_init NULL
#else
#define s3c2442_init NULL
+#define s3c2442_map_io NULL
#endif
#endif