aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorDanny Kukawka <danny.kukawka@bisect.de>2012-02-02 14:20:29 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-12 10:33:03 -0700
commite0f8bcb6766ac0960ec0b92e92c62db48f2a1716 (patch)
treebf9c3bf607bc63f036cc93f98e286f9eeb0a53a9 /drivers/misc
parent1a5fab846c9b97358a547031d27eabc1e257bd52 (diff)
downloadkernel_samsung_espresso10-e0f8bcb6766ac0960ec0b92e92c62db48f2a1716.zip
kernel_samsung_espresso10-e0f8bcb6766ac0960ec0b92e92c62db48f2a1716.tar.gz
kernel_samsung_espresso10-e0f8bcb6766ac0960ec0b92e92c62db48f2a1716.tar.bz2
cs5535-mfgpt: don't call __init function from __devinit
commit 474de3bbadd9cb75ffc32cc759c40d868343d46c upstream. Fix scan_timers() to be __devinit and not __init since the function get called from cs5535_mfgpt_probe which is __devinit. Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/cs5535-mfgpt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c
index bc685bf..87a390d 100644
--- a/drivers/misc/cs5535-mfgpt.c
+++ b/drivers/misc/cs5535-mfgpt.c
@@ -262,7 +262,7 @@ static void __init reset_all_timers(void)
* In other cases (such as with VSAless OpenFirmware), the system firmware
* leaves timers available for us to use.
*/
-static int __init scan_timers(struct cs5535_mfgpt_chip *mfgpt)
+static int __devinit scan_timers(struct cs5535_mfgpt_chip *mfgpt)
{
struct cs5535_mfgpt_timer timer = { .chip = mfgpt };
unsigned long flags;