19c19
< CONFIG_BROKEN_ON_SMP=y
---
> CONFIG_LOCK_KERNEL=y
36a37
> # CONFIG_CPUSETS is not set
70a72
> CONFIG_STOP_MACHINE=y
103c105
< CONFIG_M486=y
---
> # CONFIG_M486 is not set
110c112
< # CONFIG_MPENTIUMM is not set
---
> CONFIG_MPENTIUMM=y
127c129
< CONFIG_X86_L1_CACHE_SHIFT=4
---
> CONFIG_X86_L1_CACHE_SHIFT=6
130,131d131
< CONFIG_X86_PPRO_FENCE=y
< CONFIG_X86_F00F_BUG=y
136c136,140
< CONFIG_X86_ALIGNMENT_16=y
---
> CONFIG_X86_CMPXCHG64=y
> CONFIG_X86_GOOD_APIC=y
> CONFIG_X86_INTEL_USERCOPY=y
> CONFIG_X86_USE_PPRO_CHECKSUM=y
> CONFIG_X86_TSC=y
139c143,145
< # CONFIG_SMP is not set
---
> CONFIG_SMP=y
> CONFIG_NR_CPUS=4
> CONFIG_SCHED_SMT=y
143,144c149
< CONFIG_X86_UP_APIC=y
< CONFIG_X86_UP_IOAPIC=y
---
> CONFIG_PREEMPT_BKL=y
148,149c153,154
< # CONFIG_X86_MCE_NONFATAL is not set
< # CONFIG_X86_MCE_P4THERMAL is not set
---
> CONFIG_X86_MCE_NONFATAL=y
> CONFIG_X86_MCE_P4THERMAL=y
186a192
> CONFIG_IRQBALANCE=y
195a202
> # CONFIG_HOTPLUG_CPU is not set
204,205d210
< CONFIG_SOFTWARE_SUSPEND=y
< CONFIG_PM_STD_PARTITION=""
211,213d215
< CONFIG_ACPI_SLEEP=y
< CONFIG_ACPI_SLEEP_PROC_FS=y
< # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
747d748
< CONFIG_IRPORT_SIR=m
752,761d752
< 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
1251d1241
< CONFIG_NI5010=m
1270d1259
< CONFIG_PCMCIA_XIRTULIP=m
1492d1480
< # CONFIG_ISDN_DRV_LOOP is not set
1573,1574d1560
< CONFIG_HYSDN=m
< CONFIG_HYSDN_CAPI=y
1810d1795
< # CONFIG_FTAPE is not set
1876d1860
< CONFIG_I2C_ELEKTOR=m
2934c2918
< CONFIG_LOG_BUF_SHIFT=14
---
> CONFIG_LOG_BUF_SHIFT=15
2996a2981,2983
> CONFIG_GENERIC_PENDING_IRQ=y
> CONFIG_X86_SMP=y
> CONFIG_X86_HT=y
2997a2985
> CONFIG_X86_TRAMPOLINE=y