Merge branch 'cpuidle/3.13-fixes' of git://git.linaro.org/people/daniel.lezcano/linux into pm-cpuidle

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Rafael J. Wysocki 12 years ago 3308d535 802eee95

+1 -1

1 changed file

expand all

drivers

cpuidle

cpuidle-calxeda.c

+1 -1

drivers/cpuidle/cpuidle-calxeda.c

··· 65 .state_count = 2, 66 }; 67 68 - static int __init calxeda_cpuidle_probe(struct platform_device *pdev) 69 { 70 return cpuidle_register(&calxeda_idle_driver, NULL); 71 }

··· 65 .state_count = 2, 66 }; 67 68 + static int calxeda_cpuidle_probe(struct platform_device *pdev) 69 { 70 return cpuidle_register(&calxeda_idle_driver, NULL); 71 }