[ARM PATCH] 2112/1: S3C2410 - fix <asm/arch/regs-clock.h> for assembly inclusion

Patch from Ben Dooks

Missed protection for use when this file is included for .S files

Signed-off-by: Ben Dooks

diff --git a/include/asm-arm/arch-s3c2410/regs-clock.h b/include/asm-arm/arch-s3c2410/regs-clock.h
index baca42b8c2f1c693731bb119487af3aac57a00bd..0cc629fe1b29e1070556a3de738b23b66f38e0d9 100644 (file)
--- a/include/asm-arm/arch-s3c2410/regs-clock.h
+++ b/include/asm-arm/arch-s3c2410/regs-clock.h
@@ -14,10 +14,9 @@
  *    08-Aug-2004 Herbert Pötzl  Added CLKCON definitions
  *    19-06-2003  Ben Dooks      Created file
  *    12-03-2004  Ben Dooks      Updated include protection
+ *    29-Sep-2004 Ben Dooks     Fixed usage for assembly inclusion
  */
 
-
-
 #ifndef __ASM_ARM_REGS_CLOCK
 #define __ASM_ARM_REGS_CLOCK "$Id: clock.h,v 1.4 2003/04/30 14:50:51 ben Exp $"
 
@@ -73,6 +72,8 @@
 #define S3C2410_CLKDIVN_PDIVN       (1<<0)
 #define S3C2410_CLKDIVN_HDIVN       (1<<1)
 
+#ifndef __ASSEMBLY__
+
 static inline unsigned int
 s3c2410_get_pll(int pllval, int baseclk)
 {
@@ -89,6 +90,8 @@ s3c2410_get_pll(int pllval, int baseclk)
   return (baseclk * (mdiv + 8)) / ((pdiv + 2) << sdiv);
 }
 
+#endif /* __ASSEMBLY__ */
+
 #ifdef CONFIG_CPU_S3C2440
 
 /* extra registers */