From: Andrew Morton <akpm@osdl.org>

- Rename pmu_event() to via_pmu_event()

- Use __init

Cc: Pavel Machek <pavel@suse.cz>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: <linux-input@atrey.karlin.mff.cuni.cz>
Cc: Dmitry Torokhov <dtor_core@ameritech.net>
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/macintosh/via-pmu-event.c |    6 +++---
 drivers/macintosh/via-pmu-event.h |    2 +-
 drivers/macintosh/via-pmu.c       |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff -puN drivers/macintosh/via-pmu.c~via-pmu-add-input-device-tidy drivers/macintosh/via-pmu.c
--- 25/drivers/macintosh/via-pmu.c~via-pmu-add-input-device-tidy	Mon May  8 13:43:40 2006
+++ 25-akpm/drivers/macintosh/via-pmu.c	Mon May  8 13:43:41 2006
@@ -1446,8 +1446,8 @@ next:
 		/* len == 6 is probably a bad check. But how do I
 		 * know what PMU versions send what events here? */
 		if (len == 6) {
-			pmu_event(PMU_EVT_POWER, !!(data[1]&8));
-			pmu_event(PMU_EVT_LID, data[1]&1);
+			via_pmu_event(PMU_EVT_POWER, !!(data[1]&8));
+			via_pmu_event(PMU_EVT_LID, data[1]&1);
 		}
 	} else {
 	       pmu_pass_intr(data, len);
diff -puN drivers/macintosh/via-pmu-event.c~via-pmu-add-input-device-tidy drivers/macintosh/via-pmu-event.c
--- 25/drivers/macintosh/via-pmu-event.c~via-pmu-add-input-device-tidy	Mon May  8 13:43:41 2006
+++ 25-akpm/drivers/macintosh/via-pmu-event.c	Mon May  8 13:43:41 2006
@@ -27,7 +27,7 @@
 
 static struct input_dev *pmu_input_dev;
 
-static int pmu_event_init(void)
+static int __init via_pmu_event_init(void)
 {
 	/* do other models report button/lid status? */
 	if (pmu_get_model() != PMU_KEYLARGO_BASED)
@@ -51,7 +51,7 @@ static int pmu_event_init(void)
 	return input_register_device(pmu_input_dev);
 }
 
-void pmu_event(int key, int down)
+void via_pmu_event(int key, int down)
 {
 
 	if (unlikely(!pmu_input_dev))
@@ -72,4 +72,4 @@ void pmu_event(int key, int down)
 	input_sync(pmu_input_dev);
 }
 
-late_initcall(pmu_event_init);
+late_initcall(via_pmu_event_init);
diff -puN drivers/macintosh/via-pmu-event.h~via-pmu-add-input-device-tidy drivers/macintosh/via-pmu-event.h
--- 25/drivers/macintosh/via-pmu-event.h~via-pmu-add-input-device-tidy	Mon May  8 13:43:41 2006
+++ 25-akpm/drivers/macintosh/via-pmu-event.h	Mon May  8 13:43:41 2006
@@ -3,6 +3,6 @@
 
 #define PMU_EVT_POWER	0
 #define PMU_EVT_LID	1
-extern void pmu_event(int key, int down);
+extern void via_pmu_event(int key, int down);
 
 #endif /* __VIA_PMU_EVENT_H */
_