74c74
< CONFIG_M486=y
---
> # CONFIG_M486 is not set
92c92
< # CONFIG_MCYRIXIII is not set
---
> CONFIG_MCYRIXIII=y
97c97
< CONFIG_X86_L1_CACHE_SHIFT=4
---
> CONFIG_X86_L1_CACHE_SHIFT=5
100,101d99
< CONFIG_X86_PPRO_FENCE=y
< CONFIG_X86_F00F_BUG=y
106a105,106
> CONFIG_X86_USE_PPRO_CHECKSUM=y
> CONFIG_X86_USE_3DNOW=y
116a117
> CONFIG_X86_TSC=y
118,119c119,120
< # CONFIG_X86_MCE_NONFATAL is not set
< # CONFIG_X86_MCE_P4THERMAL is not set
---
> CONFIG_X86_MCE_NONFATAL=y
> CONFIG_X86_MCE_P4THERMAL=y
2851a2853
> # CONFIG_PAX_RANDKSTACK is not set