Commit ad51287b authored by Ben Dooks's avatar Ben Dooks Committed by Russell King

[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 
parent fb7b0e27
......@@ -14,10 +14,9 @@
* 08-Aug-2004 Herbert Ptzl 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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment