19c19
< CONFIG_BROKEN_ON_SMP=y
---
> CONFIG_LOCK_KERNEL=y
36a37
> # CONFIG_CPUSETS is not set
71a73
> CONFIG_STOP_MACHINE=y
104c106
< CONFIG_M486=y
---
> # CONFIG_M486 is not set
107c109
< # CONFIG_M586MMX is not set
---
> CONFIG_M586MMX=y
128c130
< CONFIG_X86_L1_CACHE_SHIFT=4
---
> CONFIG_X86_L1_CACHE_SHIFT=5
136a139
> CONFIG_X86_CMPXCHG64=y
137a141,143
> CONFIG_X86_GOOD_APIC=y
> CONFIG_X86_INTEL_USERCOPY=y
> CONFIG_X86_TSC=y
140c146,148
< # CONFIG_SMP is not set
---
> CONFIG_SMP=y
> CONFIG_NR_CPUS=4
> # CONFIG_SCHED_SMT is not set
144,145c152
< CONFIG_X86_UP_APIC=y
< CONFIG_X86_UP_IOAPIC=y
---
> CONFIG_PREEMPT_BKL=y
187a195
> CONFIG_IRQBALANCE=y
196a205
> CONFIG_HOTPLUG_CPU=y
197a207
> CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
206a217
> CONFIG_SUSPEND_SMP=y
221a233
> CONFIG_ACPI_HOTPLUG_CPU=y
747d758
< CONFIG_IRPORT_SIR=m
752,761d762
< 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
1118a1120
> # CONFIG_SCSI_ADVANSYS is not set
1131a1134
> # CONFIG_SCSI_HPTIOP is not set
1330d1332
< CONFIG_NI5010=m
1349d1350
< CONFIG_PCMCIA_XIRTULIP=m
1572d1572
< # CONFIG_ISDN_DRV_LOOP is not set
1653,1654d1652
< CONFIG_HYSDN=m
< CONFIG_HYSDN_CAPI=y
1890d1887
< # CONFIG_FTAPE is not set
1956d1952
< CONFIG_I2C_ELEKTOR=m
2442a2439,2450
> # CONFIG_SND_DARLA20 is not set
> # CONFIG_SND_GINA20 is not set
> # CONFIG_SND_LAYLA20 is not set
> # CONFIG_SND_DARLA24 is not set
> # CONFIG_SND_GINA24 is not set
> # CONFIG_SND_LAYLA24 is not set
> # CONFIG_SND_MONA is not set
> # CONFIG_SND_MIA is not set
> # CONFIG_SND_ECHO3G is not set
> # CONFIG_SND_INDIGO is not set
> # CONFIG_SND_INDIGOIO is not set
> # CONFIG_SND_INDIGODJ is not set
2450c2458
< CONFIG_SND_FM801_TEA575X=m
---
> # CONFIG_SND_FM801_TEA575X_BOOL is not set
2505a2514
> # CONFIG_SOUND_SSCAPE is not set
3017c3026
< CONFIG_LOG_BUF_SHIFT=14
---
> CONFIG_LOG_BUF_SHIFT=15
3079a3089,3091
> CONFIG_GENERIC_PENDING_IRQ=y
> CONFIG_X86_SMP=y
> CONFIG_X86_HT=y
3080a3093
> CONFIG_X86_TRAMPOLINE=y