summaryrefslogtreecommitdiffstats
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-02-03 01:28:13 +0100
commit474de3bbadd9cb75ffc32cc759c40d868343d46c (patch)
tree1f69a379b24e019186f26748be714a43a96b6bc9 /drivers/misc
parentvmw_balloon: fix for a -Wuninitialized warning (diff)
downloadlinux-474de3bbadd9cb75ffc32cc759c40d868343d46c.tar.xz
linux-474de3bbadd9cb75ffc32cc759c40d868343d46c.zip
cs5535-mfgpt: don't call __init function from __devinit
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 bc685bfc4c33..87a390de054c 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;