72c72
< CONFIG_M486=y
---
> # CONFIG_M486 is not set
79c79
< # CONFIG_MPENTIUMM is not set
---
> CONFIG_MPENTIUMM=y
94c94
< CONFIG_X86_L1_CACHE_SHIFT=4
---
> CONFIG_X86_L1_CACHE_SHIFT=6
97,98d96
< CONFIG_X86_PPRO_FENCE=y
< CONFIG_X86_F00F_BUG=y
103c101,103
< CONFIG_X86_ALIGNMENT_16=y
---
> CONFIG_X86_GOOD_APIC=y
> CONFIG_X86_INTEL_USERCOPY=y
> CONFIG_X86_USE_PPRO_CHECKSUM=y
112a113
> CONFIG_X86_TSC=y
114,115c115,116
< # CONFIG_X86_MCE_NONFATAL is not set
< # CONFIG_X86_MCE_P4THERMAL is not set
---
> CONFIG_X86_MCE_NONFATAL=y
> CONFIG_X86_MCE_P4THERMAL=y