summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorDanny Kukawka <danny.kukawka@bisect.de>2012-02-08 14:16:47 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-09 08:49:30 -0800
commit815b043ddac433eecb2899cb2090495b27f77aac (patch)
treeb573af31f921955137e6ad68fbf3c3ea1f6ae434 /drivers/misc
parenta3dc3c9eb0a7bcf17604ee444c48b94e2591812d (diff)
downloadlinux-815b043ddac433eecb2899cb2090495b27f77aac.tar.gz
linux-815b043ddac433eecb2899cb2090495b27f77aac.tar.bz2
linux-815b043ddac433eecb2899cb2090495b27f77aac.zip
cs5535-mfgpt: don't call __init function from __devinit
Fix and reset_all_timers() to be __devinit and not __init since the function gets called from cs5535_mfgpt_probe which is __devinit. Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> Acked-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> 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..f836359226ac 100644
--- a/drivers/misc/cs5535-mfgpt.c
+++ b/drivers/misc/cs5535-mfgpt.c
@@ -246,7 +246,7 @@ EXPORT_SYMBOL_GPL(cs5535_mfgpt_write);
* Jordan tells me that he and Mitch once played w/ it, but it's unclear
* what the results of that were (and they experienced some instability).
*/
-static void __init reset_all_timers(void)
+static void __devinit reset_all_timers(void)
{
uint32_t val, dummy;