summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-08-09 14:09:32 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-08-09 14:09:32 +0100
commitf0af7245f1725fdc39b32b59c20500448437ddbe (patch)
treed12fd927f546eac8b6c5697bb5c60f9a5e48bece /include
parent796aadeb1b2db9b5d463946766c5bbfd7717158c (diff)
parentf47c32f3ae604669c3af0b7a07917270a235bd84 (diff)
downloadop-kernel-dev-f0af7245f1725fdc39b32b59c20500448437ddbe.zip
op-kernel-dev-f0af7245f1725fdc39b32b59c20500448437ddbe.tar.gz
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.h4
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 36de0b8..3cd1ec6 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);
extern void s3c2410_init_clocks(int xtal);
-extern int s3c2410_baseclk_add(void);
-
#else
#define s3c2410_init_clocks NULL
#define s3c2410_init_uarts NULL
#define s3c2410_map_io NULL
#define s3c2410_init NULL
#endif
+
+extern int s3c2410_baseclk_add(void);
OpenPOWER on IntegriCloud