diff options
| author | Danny Kukawka <danny.kukawka@bisect.de> | 2012-02-02 14:20:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-12 10:33:03 -0700 |
| commit | e0f8bcb6766ac0960ec0b92e92c62db48f2a1716 (patch) | |
| tree | bf9c3bf607bc63f036cc93f98e286f9eeb0a53a9 | |
| parent | 1a5fab846c9b97358a547031d27eabc1e257bd52 (diff) | |
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>
| -rw-r--r-- | drivers/misc/cs5535-mfgpt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c index bc685bfc4c3..87a390de054 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; |