Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / arch / arm / mach-s3c2410 / s3c2410.h

diff --git a/arch/arm/mach-s3c2410/s3c2410.h b/arch/arm/mach-s3c2410/s3c2410.h
index 9339563..fbed084 100644 (file)
--- a/arch/arm/mach-s3c2410/s3c2410.h
+++ b/arch/arm/mach-s3c2410/s3c2410.h
@@ -1,7 +1,7 @@
 /* arch/arm/mach-s3c2410/s3c2410.h
  *
  * Copyright (c) 2004 Simtec Electronics
- * Ben Dooks <ben@simtec.co.uk>
+ *     Ben Dooks <ben@simtec.co.uk>
  *
  * Header file for s3c2410 machine directory
  *
@@ -9,22 +9,23 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
- * Modifications:
- *     18-Aug-2004 BJD  Created initial version
- *     20-Aug-2004 BJD  Added s3c2410_board struct
- *     04-Sep-2004 BJD  Added s3c2410_init_uarts() call
- *     17-Oct-2004 BJD  Moved board out to cpu
 */
 
-struct s3c2410_uartcfg;
+#ifdef CONFIG_CPU_S3C2410
 
-extern void s3c2410_map_io(struct map_desc *, int count);
+extern  int s3c2410_init(void);
 
-extern void s3c2410_init_uarts(struct s3c2410_uartcfg *, int no);
+extern void s3c2410_map_io(struct map_desc *mach_desc, int size);
 
-extern void s3c2410_init_irq(void);
+extern void s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no);
 
-struct sys_timer;
-extern struct sys_timer s3c2410_timer;
+extern void s3c2410_init_clocks(int xtal);
 
-extern void s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no);
+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