24c24
< CONFIG_M486=y
---
> # CONFIG_M486 is not set
28c28
< # CONFIG_M686 is not set
---
> CONFIG_M686=y
49,50c49
< CONFIG_X86_L1_CACHE_SHIFT=4
< CONFIG_X86_USE_STRING_486=y
---
> CONFIG_X86_L1_CACHE_SHIFT=5
51a51,54
> CONFIG_X86_HAS_TSC=y
> CONFIG_X86_GOOD_APIC=y
> CONFIG_X86_PGE=y
> CONFIG_X86_USE_PPRO_CHECKSUM=y
53c56
< # CONFIG_X86_F00F_WORKS_OK is not set
---
> CONFIG_X86_F00F_WORKS_OK=y
55,59c58,62
< # CONFIG_TOSHIBA is not set
< # CONFIG_I8K is not set
< # CONFIG_MICROCODE is not set
< # CONFIG_X86_MSR is not set
< # CONFIG_X86_CPUID is not set
---
> CONFIG_TOSHIBA=m
> CONFIG_I8K=m
> CONFIG_MICROCODE=m
> CONFIG_X86_MSR=m
> CONFIG_X86_CPUID=m
66,69c69,72
< # CONFIG_MTRR is not set
< # CONFIG_SMP is not set
< # CONFIG_X86_UP_APIC is not set
< # CONFIG_X86_UP_IOAPIC is not set
---
> CONFIG_MTRR=y
> CONFIG_SMP=y
> CONFIG_NR_CPUS=4
> # CONFIG_X86_NUMA is not set
70a74,75
> CONFIG_X86_TSC=y
> CONFIG_HAVE_DEC_LOCK=y
75a81,82
> CONFIG_X86_IO_APIC=y
> CONFIG_X86_LOCAL_APIC=y
102a110,111
> # CONFIG_HOTPLUG_PCI_IBM is not set
> # CONFIG_HOTPLUG_PCI_ACPI is not set
105,106c114
< # CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
< CONFIG_HOTPLUG_PCI_PCIE=m
---
> # CONFIG_HOTPLUG_PCI_PCIE is not set
118,125c126
< CONFIG_APM=m
< # CONFIG_APM_IGNORE_USER_SUSPEND is not set
< CONFIG_APM_DO_ENABLE=y
< CONFIG_APM_CPU_IDLE=y
< CONFIG_APM_DISPLAY_BLANK=y
< CONFIG_APM_RTC_IS_GMT=y
< # CONFIG_APM_ALLOW_INTS is not set
< CONFIG_APM_REAL_MODE_POWER_OFF=y
---
> # CONFIG_APM is not set
130c131,149
< # CONFIG_ACPI is not set
---
> CONFIG_ACPI=y
> CONFIG_ACPI_BOOT=y
> CONFIG_ACPI_BUS=y
> CONFIG_ACPI_INTERPRETER=y
> CONFIG_ACPI_EC=y
> CONFIG_ACPI_POWER=y
> CONFIG_ACPI_PCI=y
> CONFIG_ACPI_MMCONFIG=y
> CONFIG_ACPI_SLEEP=y
> CONFIG_ACPI_SYSTEM=y
> CONFIG_ACPI_AC=m
> CONFIG_ACPI_BATTERY=m
> CONFIG_ACPI_BUTTON=m
> CONFIG_ACPI_FAN=m
> CONFIG_ACPI_PROCESSOR=m
> CONFIG_ACPI_THERMAL=m
> CONFIG_ACPI_ASUS=m
> CONFIG_ACPI_TOSHIBA=m
> # CONFIG_ACPI_DEBUG is not set
204c223
< CONFIG_BLK_DEV_SX8=m
---
> # CONFIG_BLK_DEV_SX8 is not set
221c240
< CONFIG_MD_RAID5=m
---
> CONFIG_MD_RAID5=y
305c324,325
< # CONFIG_IP_NF_COMPAT_IPCHAINS is not set
---
> CONFIG_IP_NF_COMPAT_IPCHAINS=m
> CONFIG_IP_NF_NAT_NEEDED=y
516c536
< CONFIG_BLK_DEV_ATARAID_MEDLEY=m
---
> # CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
830c850
< CONFIG_PPP_MPPE_MPPC=m
---
> # CONFIG_PPP_MPPE_MPPC is not set
1102,1103c1122
< CONFIG_SERIAL=y
< CONFIG_SERIAL_CONSOLE=y
---
> CONFIG_SERIAL=m
1347c1366
< CONFIG_JFS_FS=m
---
> # CONFIG_JFS_FS is not set
1354c1373
< CONFIG_HPFS_FS=m
---
> # CONFIG_HPFS_FS is not set
1674c1693
< CONFIG_USB_W9968CF=m
---
> # CONFIG_USB_W9968CF is not set
1840a1860
> # CONFIG_GRKERNSEC_PAX_PAGEEXEC is not set
1846a1867
> # CONFIG_GRKERNSEC_PAX_RANDKSTACK is not set
1900c1921
< CONFIG_GRKERNSEC_PROC_IPADDR=y
---
> # CONFIG_GRKERNSEC_PROC_IPADDR is not set