Merge branch 'late/cleanup' into devel-late

[cascardo/linux.git] / arch / x86 / include / asm / mpspec_def.h

diff --git a/arch/x86/include/asm/mpspec_def.h b/arch/x86/include/asm/mpspec_def.h
index c0a955a..b31f8c0 100644 (file)
--- a/arch/x86/include/asm/mpspec_def.h
+++ b/arch/x86/include/asm/mpspec_def.h
@@ -84,7 +84,7 @@ struct mpc_bus {
 #define BUSTYPE_EISA   "EISA"
 #define BUSTYPE_ISA    "ISA"
 #define BUSTYPE_INTERN "INTERN"        /* Internal BUS */
-#define BUSTYPE_MCA    "MCA"
+#define BUSTYPE_MCA    "MCA"           /* Obsolete */
 #define BUSTYPE_VL     "VL"            /* Local bus */
 #define BUSTYPE_PCI    "PCI"
 #define BUSTYPE_PCMCIA "PCMCIA"
@@ -169,6 +169,5 @@ enum mp_bustype {
        MP_BUS_ISA = 1,
        MP_BUS_EISA,
        MP_BUS_PCI,
-       MP_BUS_MCA,
 };
 #endif /* _ASM_X86_MPSPEC_DEF_H */