diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-09 09:09:32 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-09 09:09:32 -0400 |
| commit | f0af7245f1725fdc39b32b59c20500448437ddbe (patch) | |
| tree | d12fd927f546eac8b6c5697bb5c60f9a5e48bece /include | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
| parent | f47c32f3ae604669c3af0b7a07917270a235bd84 (diff) | |
Merge branch 'for-rmk' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/plat-s3c24xx/s3c2410.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/plat-s3c24xx/s3c2410.h b/include/asm-arm/plat-s3c24xx/s3c2410.h index 36de0b835873..3cd1ec677b3f 100644 --- a/include/asm-arm/plat-s3c24xx/s3c2410.h +++ b/include/asm-arm/plat-s3c24xx/s3c2410.h | |||
| @@ -21,11 +21,11 @@ extern void s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no); | |||
| 21 | 21 | ||
| 22 | extern void s3c2410_init_clocks(int xtal); | 22 | extern void s3c2410_init_clocks(int xtal); |
| 23 | 23 | ||
| 24 | extern int s3c2410_baseclk_add(void); | ||
| 25 | |||
| 26 | #else | 24 | #else |
| 27 | #define s3c2410_init_clocks NULL | 25 | #define s3c2410_init_clocks NULL |
| 28 | #define s3c2410_init_uarts NULL | 26 | #define s3c2410_init_uarts NULL |
| 29 | #define s3c2410_map_io NULL | 27 | #define s3c2410_map_io NULL |
| 30 | #define s3c2410_init NULL | 28 | #define s3c2410_init NULL |
| 31 | #endif | 29 | #endif |
| 30 | |||
| 31 | extern int s3c2410_baseclk_add(void); | ||