30c30
< CONFIG_BROKEN_ON_SMP=y
---
> CONFIG_LOCK_KERNEL=y
51a52
> # CONFIG_CPUSETS is not set
91a93
> CONFIG_STOP_MACHINE=y
120c122
< # CONFIG_SMP is not set
---
> CONFIG_SMP=y
130c132,133
< # CONFIG_PARAVIRT is not set
---
> CONFIG_PARAVIRT=y
> CONFIG_VMI=y
132c135
< CONFIG_M486=y
---
> # CONFIG_M486 is not set
143c146
< # CONFIG_MK7 is not set
---
> CONFIG_MK7=y
157c160
< CONFIG_X86_L1_CACHE_SHIFT=4
---
> CONFIG_X86_L1_CACHE_SHIFT=6
163,164d165
< CONFIG_X86_PPRO_FENCE=y
< CONFIG_X86_F00F_BUG=y
169c170,175
< CONFIG_X86_ALIGNMENT_16=y
---
> CONFIG_X86_GOOD_APIC=y
> CONFIG_X86_INTEL_USERCOPY=y
> CONFIG_X86_USE_PPRO_CHECKSUM=y
> CONFIG_X86_USE_3DNOW=y
> CONFIG_X86_TSC=y
> CONFIG_X86_CMOV=y
172a179,181
> CONFIG_NR_CPUS=8
> CONFIG_SCHED_SMT=y
> CONFIG_SCHED_MC=y
176,177c185
< CONFIG_X86_UP_APIC=y
< CONFIG_X86_UP_IOAPIC=y
---
> CONFIG_PREEMPT_BKL=y
181c189
< # CONFIG_X86_MCE_NONFATAL is not set
---
> CONFIG_X86_MCE_NONFATAL=y
221a230
> CONFIG_IRQBALANCE=y
232a242
> CONFIG_HOTPLUG_CPU=y
244a255
> CONFIG_SUSPEND_SMP=y
261a273
> CONFIG_ACPI_HOTPLUG_CPU=y
814d825
< CONFIG_IRPORT_SIR=m
819,828d829
< CONFIG_DONGLE_OLD=y
< CONFIG_ESI_DONGLE_OLD=m
< CONFIG_ACTISYS_DONGLE_OLD=m
< CONFIG_TEKRAM_DONGLE_OLD=m
< CONFIG_GIRBIL_DONGLE_OLD=m
< CONFIG_LITELINK_DONGLE_OLD=m
< CONFIG_MCP2120_DONGLE_OLD=m
< CONFIG_OLD_BELKIN_DONGLE_OLD=m
< CONFIG_ACT200L_DONGLE_OLD=m
< CONFIG_MA600_DONGLE_OLD=m
1404d1404
< CONFIG_NI5010=m
1423d1422
< CONFIG_PCMCIA_XIRTULIP=m
1647d1645
< # CONFIG_ISDN_DRV_LOOP is not set
1728,1729d1725
< CONFIG_HYSDN=m
< CONFIG_HYSDN_CAPI=y
2079d2074
< CONFIG_I2C_ELEKTOR=m
3392a3388,3390
> CONFIG_GENERIC_PENDING_IRQ=y
> CONFIG_X86_SMP=y
> CONFIG_X86_HT=y
3393a3392
> CONFIG_X86_TRAMPOLINE=y