diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-06-12 05:24:22 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-06-12 05:24:22 +0900 |
| commit | ae7b6dccf6711e8d5815688f1572ab55bf5b3069 (patch) | |
| tree | 67dab64fc7782afec3a898a0b2537eb8578e610c /arch/arm/plat-samsung/include/plat/cpu-freq.h | |
| parent | 0e81a3529e2495c31b717eaba3d2644461cbc5b4 (diff) | |
| parent | f023f8dd59bf93e29e9b9bd98a92eeef43b1a32a (diff) | |
Merge branch 'v3.11-next/driver-cpufreq' into v3.11-next/s3c24xx-driver
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/cpu-freq.h')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/cpu-freq.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-samsung/include/plat/cpu-freq.h b/arch/arm/plat-samsung/include/plat/cpu-freq.h index 80c4a809c721..85517ab962ae 100644 --- a/arch/arm/plat-samsung/include/plat/cpu-freq.h +++ b/arch/arm/plat-samsung/include/plat/cpu-freq.h @@ -126,7 +126,7 @@ struct s3c_cpufreq_board { }; /* Things depending on frequency scaling. */ -#ifdef CONFIG_CPU_FREQ_S3C +#ifdef CONFIG_ARM_S3C_CPUFREQ #define __init_or_cpufreq #else #define __init_or_cpufreq __init @@ -134,7 +134,7 @@ struct s3c_cpufreq_board { /* Board functions */ -#ifdef CONFIG_CPU_FREQ_S3C +#ifdef CONFIG_ARM_S3C_CPUFREQ extern int s3c_cpufreq_setboard(struct s3c_cpufreq_board *board); #else @@ -142,4 +142,4 @@ static inline int s3c_cpufreq_setboard(struct s3c_cpufreq_board *board) { return 0; } -#endif /* CONFIG_CPU_FREQ_S3C */ +#endif /* CONFIG_ARM_S3C_CPUFREQ */ |