diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-31 16:08:08 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-31 16:08:08 -0500 |
| commit | 3308d535806dfce3e4dfe06743f16dc925aa4c4c (patch) | |
| tree | 39d894f4e06b068144b7f26f2c01eca5df72850e | |
| parent | 802eee95bde72fd0cd0f3a5b2098375a487d1eda (diff) | |
| parent | 5781532ebecd9e0b7b5fc25d78030bdec635f4ac (diff) | |
Merge branch 'cpuidle/3.13-fixes' of git://git.linaro.org/people/daniel.lezcano/linux into pm-cpuidle
Pull ARM cpuidle fixes for v3.13 from Daniel Lezcano.
* 'cpuidle/3.13-fixes' of git://git.linaro.org/people/daniel.lezcano/linux:
ARM/cpuidle: remove __init tag from Calxeda cpuidle probe function
| -rw-r--r-- | drivers/cpuidle/cpuidle-calxeda.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c index 36795639df0d..6e51114057d0 100644 --- a/drivers/cpuidle/cpuidle-calxeda.c +++ b/drivers/cpuidle/cpuidle-calxeda.c | |||
| @@ -65,7 +65,7 @@ static struct cpuidle_driver calxeda_idle_driver = { | |||
| 65 | .state_count = 2, | 65 | .state_count = 2, |
| 66 | }; | 66 | }; |
| 67 | 67 | ||
| 68 | static int __init calxeda_cpuidle_probe(struct platform_device *pdev) | 68 | static int calxeda_cpuidle_probe(struct platform_device *pdev) |
| 69 | { | 69 | { |
| 70 | return cpuidle_register(&calxeda_idle_driver, NULL); | 70 | return cpuidle_register(&calxeda_idle_driver, NULL); |
| 71 | } | 71 | } |