From: Andres Salomon <dilinger@debian.org>
Date: Sat, 9 Feb 2008 22:24:08 +0000 (+0100)
Subject: x86: GEODE: MFGPT: make mfgpt_timer_setup available outside of mfgpt_32.c
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b0e6bf2571e9385335e6337bdedb85cb629ab3fb;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

x86: GEODE: MFGPT: make mfgpt_timer_setup available outside of mfgpt_32.c

We need to be called from elsewhere, and this gets some #ifdefs out
of the .c file.

Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c
index 6f79061cf119..5cf3a839530c 100644
--- a/arch/x86/kernel/mfgpt_32.c
+++ b/arch/x86/kernel/mfgpt_32.c
@@ -43,12 +43,6 @@ static struct mfgpt_timer_t {
 #define MFGPT_HZ  (32768 / MFGPT_DIVISOR)
 #define MFGPT_PERIODIC (MFGPT_HZ / HZ)
 
-#ifdef CONFIG_GEODE_MFGPT_TIMER
-static int __init mfgpt_timer_setup(void);
-#else
-#define mfgpt_timer_setup() (0)
-#endif
-
 /* Allow for disabling of MFGPTs */
 static int disable;
 static int __init mfgpt_disable(char *s)
@@ -314,7 +308,7 @@ static struct irqaction mfgptirq  = {
 	.name = "mfgpt-timer"
 };
 
-static int __init mfgpt_timer_setup(void)
+int __init mfgpt_timer_setup(void)
 {
 	int timer, ret;
 	u16 val;
diff --git a/include/asm-x86/geode.h b/include/asm-x86/geode.h
index c4482753a358..c13630655d62 100644
--- a/include/asm-x86/geode.h
+++ b/include/asm-x86/geode.h
@@ -214,4 +214,10 @@ extern int geode_mfgpt_alloc_timer(int timer, int domain);
 #define geode_mfgpt_setup_irq(t, c, i) geode_mfgpt_set_irq((t), (c), (i), 1)
 #define geode_mfgpt_release_irq(t, c, i) geode_mfgpt_set_irq((t), (c), (i), 0)
 
+#ifdef CONFIG_GEODE_MFGPT_TIMER
+extern int __init mfgpt_timer_setup(void);
+#else
+static inline int mfgpt_timer_setup(void) { return 0; }
+#endif
+
 #endif