diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 15:20:08 +0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 15:20:08 +0400 |
commit | 86f82da586098f16d92b5637808c323f5455e935 (patch) | |
tree | 6397eb5550172b89d383254c7e4bca87ae4a8659 /arch/arm/plat-s3c24xx/include/plat/s3c244x.h | |
parent | db3c94a7edc6b29f8d52ba5884dec6a15feeadad (diff) | |
parent | e90a0f3c460406d6a5a698016bc525c3e6968cb6 (diff) | |
download | linux-86f82da586098f16d92b5637808c323f5455e935.tar.xz |
Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2
Conflicts:
arch/arm/plat-s5p/include/plat/pll.h
Diffstat (limited to 'arch/arm/plat-s3c24xx/include/plat/s3c244x.h')
-rw-r--r-- | arch/arm/plat-s3c24xx/include/plat/s3c244x.h | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/arch/arm/plat-s3c24xx/include/plat/s3c244x.h b/arch/arm/plat-s3c24xx/include/plat/s3c244x.h deleted file mode 100644 index 89e8d0a25f87..000000000000 --- a/arch/arm/plat-s3c24xx/include/plat/s3c244x.h +++ /dev/null @@ -1,42 +0,0 @@ -/* linux/arch/arm/plat-s3c24xx/include/plat/s3c244x.h - * - * Copyright (c) 2004-2005 Simtec Electronics - * Ben Dooks <ben@simtec.co.uk> - * - * Header file for S3C2440 and S3C2442 cpu support - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442) - -extern void s3c244x_map_io(void); - -extern void s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no); - -extern void s3c244x_init_clocks(int xtal); - -#else -#define s3c244x_init_clocks NULL -#define s3c244x_init_uarts 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 |