diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/asm-i386/mpspec_def.h | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
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 | ||