Browse Source

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>
Andres Salomon 17 years ago
parent
commit
b0e6bf2571
2 changed files with 7 additions and 7 deletions
  1. 1 7
      arch/x86/kernel/mfgpt_32.c
  2. 6 0
      include/asm-x86/geode.h

+ 1 - 7
arch/x86/kernel/mfgpt_32.c

@@ -43,12 +43,6 @@ static struct mfgpt_timer_t {
 #define MFGPT_HZ  (32768 / MFGPT_DIVISOR)
 #define MFGPT_HZ  (32768 / MFGPT_DIVISOR)
 #define MFGPT_PERIODIC (MFGPT_HZ / HZ)
 #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 */
 /* Allow for disabling of MFGPTs */
 static int disable;
 static int disable;
 static int __init mfgpt_disable(char *s)
 static int __init mfgpt_disable(char *s)
@@ -314,7 +308,7 @@ static struct irqaction mfgptirq  = {
 	.name = "mfgpt-timer"
 	.name = "mfgpt-timer"
 };
 };
 
 
-static int __init mfgpt_timer_setup(void)
+int __init mfgpt_timer_setup(void)
 {
 {
 	int timer, ret;
 	int timer, ret;
 	u16 val;
 	u16 val;

+ 6 - 0
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_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)
 #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
 #endif