Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e31de65 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: S3C2410: Fix link if CONFIG_S3C2410_IOTIMING is not set 



Fix the link errors if cpu-frequency support is enabled on s3c2410 systems
but there is no CONFIG_S3C2410_IOTIMING set. Fix this by ensuring the
relevant symbols are defined NULL if the code is not being built in.

Fixes the following error:
arch/arm/mach-s3c2410/built-in.o: undefined reference to `s3c2410_iotiming_get'
arch/arm/mach-s3c2410/built-in.o: undefined reference to `s3c2410_iotiming_set'
arch/arm/mach-s3c2410/built-in.o: undefined reference to `s3c2410_iotiming_calc'

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent f5fb9b1a

arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h

+7 −2
Original line number Diff line number Diff line
@@ -222,7 +222,9 @@ extern struct clk *s3c_cpufreq_clk_get(struct device *, const char *); 
/* S3C2410 and compatible exported functions */



extern void s3c2410_cpufreq_setrefresh(struct s3c_cpufreq_config *cfg);

extern void s3c2410_set_fvco(struct s3c_cpufreq_config *cfg);



#ifdef CONFIG_S3C2410_IOTIMING

extern int s3c2410_iotiming_calc(struct s3c_cpufreq_config *cfg,

				 struct s3c_iotimings *iot);
@@ -231,8 +233,11 @@ extern int s3c2410_iotiming_get(struct s3c_cpufreq_config *cfg, 


extern void s3c2410_iotiming_set(struct s3c_cpufreq_config *cfg,

				 struct s3c_iotimings *iot);



extern void s3c2410_set_fvco(struct s3c_cpufreq_config *cfg);

#else

#define s3c2410_iotiming_calc NULL

#define s3c2410_iotiming_get NULL

#define s3c2410_iotiming_set NULL

#endif /* CONFIG_S3C2410_IOTIMING */



/* S3C2412 compatible routines */