[kernel] add simple prom emulator for MIPS

[openwrt.git] / target / linux / x86 / config-2.6.23

diff --git a/target/linux/x86/config-2.6.23 b/target/linux/x86/config-2.6.23
index a848fa9..73927c7 100644 (file)
--- a/target/linux/x86/config-2.6.23
+++ b/target/linux/x86/config-2.6.23
@@ -6,6 +6,7 @@ CONFIG_8139TOO_PIO=y
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_8139_OLD_RX_RESET is not set
 # CONFIG_AC3200 is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_8139_OLD_RX_RESET is not set
 # CONFIG_AC3200 is not set

+CONFIG_AC97_BUS=m

 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_AGP is not set
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_AGP is not set


@@ -24,27 +25,21 @@ CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_PIIX=m
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_PIIX=m

-# CONFIG_ATM_DRIVERS is not set

 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_GENERIC=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_GENERIC=y

-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set

 CONFIG_BLK_DEV_IDE=y
 CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_BLK_DEV_IDE=y
 CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_BLK_DEV_IDEDMA=y

-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set

 CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_BLK_DEV_SC1200=y
 CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_BLK_DEV_XD is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_BLK_DEV_SC1200=y
 CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_BLK_DEV_XD is not set

+CONFIG_BOUNCE=y

 # CONFIG_BT_HIDP is not set
 # CONFIG_BT_HIDP is not set

-# CONFIG_CD_NO_IDESCSI is not set

 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_COMPAT_VDSO=y
 # CONFIG_CPU5_WDT is not set
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_COMPAT_VDSO=y
 # CONFIG_CPU5_WDT is not set


@@ -62,8 +57,6 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CRYPTO_AES_586=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CRYPTO_AES_586=m

-CONFIG_CRYPTO_DEV_GEODE=m
-# CONFIG_CRYPTO_DEV_PADLOCK is not set

 CONFIG_CRYPTO_TWOFISH_586=m
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set
 CONFIG_CRYPTO_TWOFISH_586=m
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set


@@ -72,8 +65,8 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DELL_RBU is not set
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y
 # CONFIG_DELL_RBU is not set
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y

-# CONFIG_DMASCC is not set

 CONFIG_DMI=y
 CONFIG_DMI=y

+# CONFIG_DMIID is not set

 CONFIG_DNOTIFY=y
 CONFIG_DOUBLEFAULT=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DNOTIFY=y
 CONFIG_DOUBLEFAULT=y
 CONFIG_DUMMY_CONSOLE=y


@@ -93,10 +86,12 @@ CONFIG_ELF_CORE=y
 # CONFIG_EMBEDDED is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EXT2_FS=y
 # CONFIG_EMBEDDED is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EXT2_FS=y

+CONFIG_FIX_EARLYCON_MEM=y

 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y

+CONFIG_GENERIC_CMOS_UPDATE=y

 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_PENDING_IRQ=y


@@ -104,12 +99,12 @@ CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y

+CONFIG_HIBERNATION_SMP_POSSIBLE=y

 CONFIG_HID=y
 CONFIG_HID=y

+CONFIG_HID_SUPPORT=y

 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HIGH_RES_TIMERS is not set
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HIGH_RES_TIMERS is not set

-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOTPLUG_CPU is not set

 # CONFIG_HPET_TIMER is not set
 CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HPET_TIMER is not set
 CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set


@@ -126,7 +121,6 @@ CONFIG_I2C=m
 CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=m

-CONFIG_I2C_ISA=m

 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_I82365 is not set
 # CONFIG_I8K is not set
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_I82365 is not set
 # CONFIG_I8K is not set


@@ -137,7 +131,6 @@ CONFIG_IDE=y
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_IDEDMA_ONLYDISK is not set
 CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_IDEDMA_ONLYDISK is not set
 CONFIG_IDEPCI_PCIBUS_ORDER=y

-CONFIG_IDEPCI_SHARE_IRQ=y

 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
 CONFIG_IDE_GENERIC=y
 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
 CONFIG_IDE_GENERIC=y


@@ -151,13 +144,13 @@ CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

+# CONFIG_INSTRUMENTATION is not set

 CONFIG_IRQBALANCE=y
 CONFIG_ISA=y
 CONFIG_ISAPNP=y
 CONFIG_ISA_DMA_API=y
 # CONFIG_ITCO_WDT is not set
 CONFIG_KALLSYMS=y
 CONFIG_IRQBALANCE=y
 CONFIG_ISA=y
 CONFIG_ISAPNP=y
 CONFIG_ISA_DMA_API=y
 # CONFIG_ITCO_WDT is not set
 CONFIG_KALLSYMS=y

-# CONFIG_KALLSYMS_EXTRA_PASS is not set

 CONFIG_KEXEC=y
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 CONFIG_KEXEC=y
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set


@@ -165,17 +158,11 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set

-# CONFIG_KPROBES is not set

 CONFIG_KTIME_SCALAR=y
 CONFIG_KTIME_SCALAR=y

-# CONFIG_KVM is not set

 # CONFIG_LANCE is not set
 CONFIG_LEDS_NET48XX=m
 # CONFIG_LEDS_WRAP is not set
 CONFIG_LOCK_KERNEL=y
 # CONFIG_LANCE is not set
 CONFIG_LEDS_NET48XX=m
 # CONFIG_LEDS_WRAP is not set
 CONFIG_LOCK_KERNEL=y

-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set

 CONFIG_M386=y
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
 CONFIG_M386=y
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set


@@ -199,10 +186,6 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set

-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set

 CONFIG_MOUSE_PS2=y
 CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2=y
 CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_LIFEBOOK=y


@@ -255,16 +238,12 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_MTRR=y
 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
 CONFIG_MTRR=y
 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set

-# CONFIG_MWAVE is not set

 # CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
 CONFIG_NETDEV_1000=y
 # CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
 CONFIG_NETDEV_1000=y

-# CONFIG_NET_ISA is not set
-# CONFIG_NET_SB1000 is not set
-CONFIG_NET_SCH_FIFO=y

 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set


@@ -293,6 +272,8 @@ CONFIG_PCMCIA=m
 CONFIG_PCMCIA_IOCTL=y
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_PROBE=y
 CONFIG_PCMCIA_IOCTL=y
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_PROBE=y

+CONFIG_PCNET32=m
+CONFIG_PCNET32_NAPI=y

 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000


@@ -305,7 +286,6 @@ CONFIG_QUICKLIST=y
 # CONFIG_RELOCATABLE is not set
 CONFIG_RTC=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RELOCATABLE is not set
 CONFIG_RTC=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y

-CONFIG_RWSEM_XCHGADD_ALGORITHM=y

 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
 CONFIG_SC1200_WDT=m
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
 CONFIG_SC1200_WDT=m


@@ -313,6 +293,7 @@ CONFIG_SC1200_WDT=m
 # CONFIG_SCC is not set
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
 # CONFIG_SCC is not set
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y

+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set

 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y
 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y


@@ -322,10 +303,7 @@ CONFIG_SCx200_I2C=m
 CONFIG_SCx200_I2C_SCL=12
 CONFIG_SCx200_I2C_SDA=13
 CONFIG_SCx200_WDT=m
 CONFIG_SCx200_I2C_SCL=12
 CONFIG_SCx200_I2C_SDA=13
 CONFIG_SCx200_WDT=m

-# CONFIG_SECCOMP is not set

 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_SEMAPHORE_SLEEPERS=y

-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_CORETEMP is not set

 CONFIG_SENSORS_PC87360=m
 # CONFIG_SERIAL_8250_CS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SENSORS_PC87360=m
 # CONFIG_SERIAL_8250_CS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set


@@ -340,10 +318,16 @@ CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_SERPORT=y
 CONFIG_SMP=y
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_SERIO_SERPORT=y
 CONFIG_SMP=y
 # CONFIG_SMSC37B787_WDT is not set

+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_AC97_POWER_SAVE is not set
+# CONFIG_SND_CS5530 is not set
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_INTEL8X0=m

 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SONYPI is not set
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_STOP_MACHINE=y
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SONYPI is not set
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_STOP_MACHINE=y

+CONFIG_SUSPEND_SMP_POSSIBLE=y

 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TCIC is not set
 # CONFIG_TELCLOCK is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TCIC is not set
 # CONFIG_TELCLOCK is not set


@@ -351,49 +335,37 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_TYPHOON is not set
 CONFIG_UID16=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_TYPHOON is not set
 CONFIG_UID16=y

-# CONFIG_UNUSED_SYMBOLS is not set

 # CONFIG_USBPCWATCHDOG is not set
 # CONFIG_USBPCWATCHDOG is not set

-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set

 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_HCD=m

-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set

 CONFIG_USB_EHCI_SPLIT_ISO=y
 CONFIG_USB_EHCI_SPLIT_ISO=y

-# CONFIG_USB_EHCI_TT_NEWSCHED is not set

 # CONFIG_USB_NET_DM9601 is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_NET_DM9601 is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m

+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set

 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_UHCI_HCD=m

+# CONFIG_USER_NS is not set

 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VGA_CONSOLE=y
 CONFIG_VIA_RHINE=m
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VGA_CONSOLE=y
 CONFIG_VIA_RHINE=m

-# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_MMIO=y

 CONFIG_VIA_RHINE_NAPI=y
 # CONFIG_VIDEO_SELECT is not set
 CONFIG_VIA_RHINE_NAPI=y
 # CONFIG_VIDEO_SELECT is not set

+# CONFIG_VIRTUALIZATION is not set

 CONFIG_VM86=y
 CONFIG_VM86=y

-# CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_VMSPLIT_3G is not set
-# CONFIG_VMSPLIT_3G_OPT is not set

 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VORTEX=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VORTEX=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set

-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set

 # CONFIG_WAFER_WDT is not set
 # CONFIG_WDT is not set
 CONFIG_X86=y
 CONFIG_X86_32=y
 # CONFIG_WAFER_WDT is not set
 # CONFIG_WDT is not set
 CONFIG_X86=y
 CONFIG_X86_32=y

-CONFIG_X86_ALIGNMENT_16=y

 # CONFIG_X86_BIGSMP is not set
 CONFIG_X86_BIOS_REBOOT=y
 # CONFIG_X86_BIGSMP is not set
 CONFIG_X86_BIOS_REBOOT=y

-CONFIG_X86_BSWAP=y
-CONFIG_X86_CMPXCHG=y

 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
 # CONFIG_X86_CPUID is not set
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
 # CONFIG_X86_CPUID is not set
 # CONFIG_X86_ELAN is not set


@@ -406,7 +378,6 @@ CONFIG_X86_GENERIC=y
 CONFIG_X86_GX_SUSPMOD=m
 CONFIG_X86_HT=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_GX_SUSPMOD=m
 CONFIG_X86_HT=y
 CONFIG_X86_INTEL_USERCOPY=y

-CONFIG_X86_INVLPG=y

 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_X86_LOCAL_APIC=y


@@ -414,13 +385,13 @@ CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_MCE=y
 # CONFIG_X86_MCE_NONFATAL is not set
 # CONFIG_X86_MCE_P4THERMAL is not set
 CONFIG_X86_MCE=y
 # CONFIG_X86_MCE_NONFATAL is not set
 # CONFIG_X86_MCE_P4THERMAL is not set

-CONFIG_X86_MINIMUM_CPU_MODEL=0
+CONFIG_X86_MINIMUM_CPU_FAMILY=3

 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_MSR is not set
 # CONFIG_X86_NUMAQ is not set
 # CONFIG_X86_P4_CLOCKMOD is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_MSR is not set
 # CONFIG_X86_NUMAQ is not set
 # CONFIG_X86_P4_CLOCKMOD is not set

+# CONFIG_X86_PAE is not set

 CONFIG_X86_PC=y
 CONFIG_X86_PC=y

-CONFIG_X86_POPAD_OK=y

 # CONFIG_X86_POWERNOW_K6 is not set
 # CONFIG_X86_POWERNOW_K7 is not set
 # CONFIG_X86_POWERNOW_K8 is not set
 # CONFIG_X86_POWERNOW_K6 is not set
 # CONFIG_X86_POWERNOW_K7 is not set
 # CONFIG_X86_POWERNOW_K8 is not set


@@ -433,11 +404,8 @@ CONFIG_X86_SMP=y
 # CONFIG_X86_SPEEDSTEP_SMI is not set
 # CONFIG_X86_SUMMIT is not set
 CONFIG_X86_TRAMPOLINE=y
 # CONFIG_X86_SPEEDSTEP_SMI is not set
 # CONFIG_X86_SUMMIT is not set
 CONFIG_X86_TRAMPOLINE=y

-# CONFIG_X86_UP_APIC is not set

 # CONFIG_X86_VISWS is not set
 # CONFIG_X86_VOYAGER is not set
 # CONFIG_X86_VISWS is not set
 # CONFIG_X86_VOYAGER is not set

-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_XADD=y

 CONFIG_YENTA_ENE_TUNE=y
 CONFIG_YENTA_O2=y
 CONFIG_YENTA_RICOH=y
 CONFIG_YENTA_ENE_TUNE=y
 CONFIG_YENTA_O2=y
 CONFIG_YENTA_RICOH=y