diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-12-16 11:22:25 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-12-16 11:22:27 +0100 |
commit | 006b20fe4c69189b0d854e5eabf269e50ca86cdd (patch) | |
tree | 948b08825a36114c85ddc2bfcd965c261e32810f /arch/arm/plat-s3c24xx/include/plat/s3c244x.h | |
parent | 5f29805a4f4627e766f862ff9f10c14f5f314359 (diff) | |
parent | d949750fed168b6553ca11ed19e4affd19d7a4d7 (diff) | |
download | op-kernel-dev-006b20fe4c69189b0d854e5eabf269e50ca86cdd.zip op-kernel-dev-006b20fe4c69189b0d854e5eabf269e50ca86cdd.tar.gz |
Merge branch 'perf/urgent' into perf/core
Merge reason: We want to apply a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/plat-s3c24xx/include/plat/s3c244x.h')
-rw-r--r-- | arch/arm/plat-s3c24xx/include/plat/s3c244x.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/include/plat/s3c244x.h b/arch/arm/plat-s3c24xx/include/plat/s3c244x.h index 307248d..89e8d0a 100644 --- 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 -#define s3c244x_map_io NULL #endif #ifdef CONFIG_CPU_S3C2440 extern int s3c2440_init(void); + +extern void s3c2440_map_io(void); #else #define s3c2440_init NULL +#define s3c2440_map_io NULL #endif #ifdef CONFIG_CPU_S3C2442 extern int s3c2442_init(void); + +extern void s3c2442_map_io(void); #else #define s3c2442_init NULL +#define s3c2442_map_io NULL #endif |