From e5a862d7cc183b4542b67c633560e342078de6e3 Mon Sep 17 00:00:00 2001
From: Danny Kukawka <danny.kukawka@bisect.de>
Date: Thu, 2 Feb 2012 14:20:29 +0100
Subject: [PATCH] --- yaml --- r: 287398 b: refs/heads/master c:
 474de3bbadd9cb75ffc32cc759c40d868343d46c h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/misc/cs5535-mfgpt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6ff97c2399ef..97c5635b7d2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e5ba466d515eb3fb1e0e975a3d8e499126ae2b5
+refs/heads/master: 474de3bbadd9cb75ffc32cc759c40d868343d46c
diff --git a/trunk/drivers/misc/cs5535-mfgpt.c b/trunk/drivers/misc/cs5535-mfgpt.c
index bc685bfc4c33..87a390de054c 100644
--- a/trunk/drivers/misc/cs5535-mfgpt.c
+++ b/trunk/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;