--- /home/akhavr/RPM/SOURCES/config-2.6.16-ovz-smp.i586 2006-09-19 22:59:31 +0300 +++ config-2.6.16-ovz-up.i586 2006-10-19 17:23:41 +0300 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-ovz-smp-alt7 +# Linux kernel version: 2.6.16-ovz-up-alt7 # Tue Sep 19 23:59:31 2006 # CONFIG_X86_32=y @@ -95,6 +95,10 @@ # Processor type and features # CONFIG_X86_PC=y +# CONFIG_X86_VSMP is not set +# CONFIG_MPSC is not set +CONFIG_GENERIC_CPU=y +CONFIG_X86_L1_CACHE_BYTES=128 # CONFIG_X86_ELAN is not set # CONFIG_X86_VOYAGER is not set # CONFIG_X86_NUMAQ is not set @@ -141,7 +145,7 @@ CONFIG_X86_ALIGNMENT_16=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_HPET_TIMER=y -CONFIG_SMP=y +CONFIG_SMP=n CONFIG_NR_CPUS=8 CONFIG_SCHED_VCPU=y CONFIG_FAIRSCHED=y @@ -150,10 +154,15 @@ # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_BKL is not set +CONFIG_X86_UP_APIC=y +CONFIG_X86_UP_IOAPIC=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_NMI_WATCHDOG=y +# CONFIG_GART_IOMMU is not set CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_NONFATAL=m CONFIG_X86_MCE_P4THERMAL=y CONFIG_TOSHIBA=m @@ -174,7 +183,7 @@ CONFIG_HIGHMEM64G=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -CONFIG_X86_PAE=y +CONFIG_X86_PAE=n CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -216,6 +225,8 @@ # ACPI (Advanced Configuration and Power Interface) Support # CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SLEEP_PROC_SLEEP=n CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BUTTON=m @@ -301,6 +312,7 @@ CONFIG_PCI_BIOS=y CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y +CONFIG_UNORDERED_IO=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set @@ -361,6 +373,10 @@ CONFIG_BINFMT_ELF=y CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_MISC=m +CONFIG_IA32_EMULATION=y +CONFIG_IA32_AOUT=m +CONFIG_COMPAT=y +CONFIG_SYSVIPC_COMPAT=y # # Networking @@ -745,6 +761,7 @@ CONFIG_MKISS=m CONFIG_6PACK=m CONFIG_BPQETHER=m +CONFIG_DMASCC=m CONFIG_SCC=m CONFIG_SCC_DELAY=y CONFIG_SCC_TRXECHO=y @@ -796,10 +813,12 @@ # # Old SIR device drivers # +CONFIG_IRPORT_SIR=m # # Old Serial dongle support # +CONFIG_DONGLE_OLD=n # # FIR device drivers @@ -1302,10 +1321,13 @@ CONFIG_CD_NO_IDESCSI=y CONFIG_AZTCD=m CONFIG_GSCD=m +CONFIG_SBPCD=m CONFIG_MCDX=m CONFIG_OPTCD=m +CONFIG_CM206=m CONFIG_SJCD=m CONFIG_ISP16_CDI=m +CONFIG_CDU31A=m CONFIG_CDU535=m # @@ -1448,6 +1470,7 @@ CONFIG_ULTRA=m CONFIG_SMC9194=m CONFIG_NET_VENDOR_RACAL=y +CONFIG_NI5010=m CONFIG_NI52=m CONFIG_NI65=m @@ -1465,6 +1488,7 @@ CONFIG_DM9102=m CONFIG_ULI526X=m CONFIG_PCMCIA_XIRCOM=m +CONFIG_PCMCIA_XIRTULIP=m CONFIG_AT1700=m CONFIG_DEPCA=m CONFIG_HP100=m @@ -1753,6 +1777,7 @@ # # ISDN feature submodules # +CONFIG_ISDN_DRV_LOOP=m CONFIG_ISDN_DIVERSION=m # @@ -1829,6 +1854,8 @@ # # Active cards # +CONFIG_HYSDN=m +CONFIG_HYSDN_CAPI=y CONFIG_ISDN_DRV_ICN=m CONFIG_ISDN_DRV_PCBIT=m CONFIG_ISDN_DRV_SC=m @@ -1989,10 +2016,15 @@ CONFIG_SYNCLINKMP=m CONFIG_SYNCLINK_GT=m CONFIG_N_HDLC=m +CONFIG_RISCOM8=m CONFIG_SPECIALIX=m CONFIG_SPECIALIX_RTSCTS=y CONFIG_SX=m +CONFIG_RIO=m +CONFIG_RIO_OLDPCI=y CONFIG_STALDRV=y +CONFIG_STALLION=m +CONFIG_ISTALLION=m # # Serial drivers @@ -2098,6 +2130,8 @@ # # Ftape, the floppy tape device driver # +CONFIG_FTAPE=n + CONFIG_AGP=m CONFIG_AGP_ALI=m CONFIG_AGP_ATI=m @@ -2157,6 +2191,7 @@ CONFIG_I2C_AMD756=m CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m +CONFIG_I2C_ELEKTOR=m CONFIG_I2C_I801=m CONFIG_I2C_I810=m CONFIG_I2C_PIIX4=m @@ -3197,7 +3232,7 @@ # # CONFIG_DEBUG_RODATA is not set # CONFIG_4KSTACKS is not set -CONFIG_X86_FIND_SMP_CONFIG=y +CONFIG_X86_FIND_SMP_CONFIG=n CONFIG_X86_MPPARSE=y # @@ -3248,6 +3283,7 @@ CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_X86_64=m CONFIG_CRYPTO_AES_586=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m @@ -3297,7 +3333,7 @@ CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_X86_SMP=y +CONFIG_X86_SMP=n CONFIG_X86_HT=y CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_TRAMPOLINE=y