X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-x86%2Fgeode.h;h=9e7280092a486ba33d31ef567f22349fc25e0810;hb=37ddd5d053c57fee798d72fa9c18660f59a9299b;hp=c4482753a358d595b8274791d352bc1c1a8f8b22;hpb=fa28e067c3b8af96c79c060e163b1387c172ae75;p=linux-2.6

diff --git a/include/asm-x86/geode.h b/include/asm-x86/geode.h
index c4482753a3..9e7280092a 100644
--- a/include/asm-x86/geode.h
+++ b/include/asm-x86/geode.h
@@ -206,7 +206,6 @@ static inline u16 geode_mfgpt_read(int timer, u16 reg)
 	return inw(base + reg + (timer * 8));
 }
 
-extern int __init geode_mfgpt_detect(void);
 extern int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable);
 extern int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable);
 extern int geode_mfgpt_alloc_timer(int timer, int domain);
@@ -214,4 +213,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