diff options
| author | Rafael J. Wysocki <rjw@rjwysocki.net> | 2013-10-25 22:36:40 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@rjwysocki.net> | 2013-10-25 22:36:40 +0200 |
| commit | 6ddee424fea2d269c2f402278d93165c7b92dc58 (patch) | |
| tree | c1b1d0d9058846a6da22def648dea61e16faacd0 /arch/arm/mach-sa1100/generic.h | |
| parent | e4db1c7439b31993a4886b273bb9235a8eea82bf (diff) | |
| parent | a814613b9a32d9ab9578d9dab396265c826d37f0 (diff) | |
Merge back earlier 'pm-cpufreq' material.
Conflicts:
drivers/cpufreq/omap-cpufreq.c
Diffstat (limited to 'arch/arm/mach-sa1100/generic.h')
| -rw-r--r-- | arch/arm/mach-sa1100/generic.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/generic.h b/arch/arm/mach-sa1100/generic.h index 9a33695c9492..cbdfae744dc5 100644 --- a/arch/arm/mach-sa1100/generic.h +++ b/arch/arm/mach-sa1100/generic.h @@ -3,6 +3,7 @@ * * Author: Nicolas Pitre */ +#include <linux/cpufreq.h> #include <linux/reboot.h> extern void sa1100_timer_init(void); @@ -19,10 +20,8 @@ extern void sa11x0_init_late(void); extern void sa1110_mb_enable(void); extern void sa1110_mb_disable(void); -struct cpufreq_policy; - +extern struct cpufreq_frequency_table sa11x0_freq_table[]; extern unsigned int sa11x0_freq_to_ppcr(unsigned int khz); -extern int sa11x0_verify_speed(struct cpufreq_policy *policy); extern unsigned int sa11x0_getspeed(unsigned int cpu); extern unsigned int sa11x0_ppcr_to_freq(unsigned int idx); |