diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /include/asm-i386/mpspec_def.h | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-i386/mpspec_def.h')
| -rw-r--r-- | include/asm-i386/mpspec_def.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-i386/mpspec_def.h b/include/asm-i386/mpspec_def.h index 76feedf85a8a..13bafb16e7af 100644 --- a/include/asm-i386/mpspec_def.h +++ b/include/asm-i386/mpspec_def.h | |||
| @@ -97,7 +97,6 @@ struct mpc_config_bus | |||
| 97 | #define BUSTYPE_TC "TC" | 97 | #define BUSTYPE_TC "TC" |
| 98 | #define BUSTYPE_VME "VME" | 98 | #define BUSTYPE_VME "VME" |
| 99 | #define BUSTYPE_XPRESS "XPRESS" | 99 | #define BUSTYPE_XPRESS "XPRESS" |
| 100 | #define BUSTYPE_NEC98 "NEC98" | ||
| 101 | 100 | ||
| 102 | struct mpc_config_ioapic | 101 | struct mpc_config_ioapic |
| 103 | { | 102 | { |
| @@ -182,7 +181,6 @@ enum mp_bustype { | |||
| 182 | MP_BUS_EISA, | 181 | MP_BUS_EISA, |
| 183 | MP_BUS_PCI, | 182 | MP_BUS_PCI, |
| 184 | MP_BUS_MCA, | 183 | MP_BUS_MCA, |
| 185 | MP_BUS_NEC98 | ||
| 186 | }; | 184 | }; |
| 187 | #endif | 185 | #endif |
| 188 | 186 | ||