X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fmca.h;h=5cff2923092bfca0aaa9cd050f1855befbec03ad;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=b1289a792d54a5595c570e6d526e22b560da2f58;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/include/linux/mca.h b/include/linux/mca.h
index b1289a792..5cff29230 100644
--- a/include/linux/mca.h
+++ b/include/linux/mca.h
@@ -6,20 +6,14 @@
 #ifndef _LINUX_MCA_H
 #define _LINUX_MCA_H
 
-/* FIXME: This shouldn't happen, but we need everything that previously
- * included mca.h to compile.  Take it out later when the MCA #includes
- * are sorted out */
 #include <linux/device.h>
 
-/* get the platform specific defines */
+#ifdef CONFIG_MCA
 #include <asm/mca.h>
 
-/* The detection of MCA bus is done in the real mode (using BIOS).
- * The information is exported to the protected code, where this
- * variable is set to one in case MCA bus was detected.
- */
-#ifndef MCA_bus__is_a_macro
-extern int  MCA_bus;
+extern int MCA_bus;
+#else
+#define MCA_bus 0
 #endif
 
 /* This sets up an information callback for /proc/mca/slot?.  The
@@ -144,7 +138,7 @@ static inline void mca_do_proc_init(void)
 {
 }
 
-static inline void mca_set_adapter_procfn(int slot, MCA_ProcFn *fn, void* dev)
+static inline void mca_set_adapter_procfn(int slot, MCA_ProcFn fn, void* dev)
 {
 }
 #endif