diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-26 18:21:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-26 18:21:04 -0800 |
| commit | 1972ddad12a62c982f388bd9080136aa1347ca8b (patch) | |
| tree | d920dd756b7fe92459db469e90241a0d7a92d8a0 /include/linux | |
| parent | 0812e18a81c837b6df2129ced0a86743b3557d8d (diff) | |
| parent | d334942ba8503e147a6cff32417129c0edbb979f (diff) | |
Merge bk://linux-voyager.bkbits.net/mca-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mca.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/include/linux/mca.h b/include/linux/mca.h index a80124c4a05d..5cff2923092b 100644 --- a/include/linux/mca.h +++ b/include/linux/mca.h @@ -6,22 +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> -#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 |