git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
linux
/
mca.h
diff --git
a/include/linux/mca.h
b/include/linux/mca.h
index
a80124c
..
5cff292
100644
(file)
--- a/
include/linux/mca.h
+++ b/
include/linux/mca.h
@@
-6,22
+6,14
@@
#ifndef _LINUX_MCA_H
#define _LINUX_MCA_H
#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>
#include <linux/device.h>
-/* get the platform specific defines */
#ifdef CONFIG_MCA
#include <asm/mca.h>
#ifdef CONFIG_MCA
#include <asm/mca.h>
-#endif
-/* 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
#endif
/* This sets up an information callback for /proc/mca/slot?. The