diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-10 14:19:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-10 14:19:13 -0500 |
| commit | 5e0af24cee56e75d0cb13dc072539acb52f694cf (patch) | |
| tree | 94353a6408b6bf148ad58769d0a040e1c54b1587 /drivers | |
| parent | 22056614ee39ef43670814d2000f810901768277 (diff) | |
| parent | 464b500e37a588be69ed9c9c21bca62a578ca66c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 fixes from Hans-Christian Egtvedt.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: favr-32: clk_round_rate() can return a zero upon error
avr32: remove deprecated IRQF_DISABLED
cpufreq_ at32ap-cpufreq.c: Fix section mismatch
avr32: pm: Fix section mismatch
avr32: Kill CONFIG_MTD_PARTITIONS
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/at32ap-cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/at32ap-cpufreq.c b/drivers/cpufreq/at32ap-cpufreq.c index 856ad80418ae..7c03dd84f66a 100644 --- a/drivers/cpufreq/at32ap-cpufreq.c +++ b/drivers/cpufreq/at32ap-cpufreq.c | |||
| @@ -58,7 +58,7 @@ static int at32_set_target(struct cpufreq_policy *policy, unsigned int index) | |||
| 58 | return 0; | 58 | return 0; |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | static int __init at32_cpufreq_driver_init(struct cpufreq_policy *policy) | 61 | static int at32_cpufreq_driver_init(struct cpufreq_policy *policy) |
| 62 | { | 62 | { |
| 63 | unsigned int frequency, rate, min_freq; | 63 | unsigned int frequency, rate, min_freq; |
| 64 | int retval, steps, i; | 64 | int retval, steps, i; |