Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59db2e6e authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Update defconfig 



Update defconfig

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 18a2b647

arch/x86_64/defconfig

+30 −28
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.11-bk7

# Linux kernel version: 2.6.12-rc4

# Sat Mar 12 23:43:44 2005

# Fri May 13 06:39:11 2005

#

#

CONFIG_X86_64=y

CONFIG_X86_64=y

CONFIG_64BIT=y

CONFIG_64BIT=y
@@ -11,8 +11,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y 
CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_X86_CMPXCHG=y

CONFIG_X86_CMPXCHG=y

CONFIG_EARLY_PRINTK=y

CONFIG_EARLY_PRINTK=y

CONFIG_HPET_TIMER=y

CONFIG_HPET_EMULATE_RTC=y

CONFIG_GENERIC_ISA_DMA=y

CONFIG_GENERIC_ISA_DMA=y

CONFIG_GENERIC_IOMAP=y

CONFIG_GENERIC_IOMAP=y
@@ -22,6 +20,7 @@ CONFIG_GENERIC_IOMAP=y 
CONFIG_EXPERIMENTAL=y

CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_CLEAN_COMPILE=y

CONFIG_LOCK_KERNEL=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32





#

#

# General setup

# General setup
@@ -33,7 +32,6 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

# CONFIG_AUDIT is not set

CONFIG_LOG_BUF_SHIFT=18

# CONFIG_HOTPLUG is not set

# CONFIG_HOTPLUG is not set

CONFIG_KOBJECT_UEVENT=y

CONFIG_KOBJECT_UEVENT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG=y
@@ -43,10 +41,11 @@ CONFIG_IKCONFIG_PROC=y 
CONFIG_KALLSYMS=y

CONFIG_KALLSYMS=y

CONFIG_KALLSYMS_ALL=y

CONFIG_KALLSYMS_ALL=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_BASE_FULL=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_EPOLL=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SHMEM=y

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LABELS=0
@@ -93,6 +92,9 @@ CONFIG_DISCONTIGMEM=y 
CONFIG_NUMA=y

CONFIG_NUMA=y

CONFIG_HAVE_DEC_LOCK=y

CONFIG_HAVE_DEC_LOCK=y

CONFIG_NR_CPUS=8

CONFIG_NR_CPUS=8

CONFIG_HPET_TIMER=y

CONFIG_X86_PM_TIMER=y

CONFIG_HPET_EMULATE_RTC=y

CONFIG_GART_IOMMU=y

CONFIG_GART_IOMMU=y

CONFIG_SWIOTLB=y

CONFIG_SWIOTLB=y

CONFIG_X86_MCE=y

CONFIG_X86_MCE=y
@@ -100,6 +102,7 @@ CONFIG_X86_MCE_INTEL=y 
CONFIG_SECCOMP=y

CONFIG_SECCOMP=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_ISA_DMA_API=y





#

#

# Power management options

# Power management options
@@ -129,7 +132,7 @@ CONFIG_ACPI_NUMA=y 
# CONFIG_ACPI_IBM is not set

# CONFIG_ACPI_IBM is not set

CONFIG_ACPI_TOSHIBA=y

CONFIG_ACPI_TOSHIBA=y

CONFIG_ACPI_BLACKLIST_YEAR=2001

CONFIG_ACPI_BLACKLIST_YEAR=2001

CONFIG_ACPI_DEBUG=y

# CONFIG_ACPI_DEBUG is not set

CONFIG_ACPI_BUS=y

CONFIG_ACPI_BUS=y

CONFIG_ACPI_EC=y

CONFIG_ACPI_EC=y

CONFIG_ACPI_POWER=y

CONFIG_ACPI_POWER=y
@@ -141,6 +144,7 @@ CONFIG_ACPI_SYSTEM=y 
# CPU Frequency scaling

# CPU Frequency scaling

#

#

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_TABLE=y

# CONFIG_CPU_FREQ_DEBUG is not set

# CONFIG_CPU_FREQ_DEBUG is not set

CONFIG_CPU_FREQ_STAT=y

CONFIG_CPU_FREQ_STAT=y

# CONFIG_CPU_FREQ_STAT_DETAILS is not set

# CONFIG_CPU_FREQ_STAT_DETAILS is not set
@@ -150,7 +154,6 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y 
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set

# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set

CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_ONDEMAND=y

CONFIG_CPU_FREQ_GOV_ONDEMAND=y

CONFIG_CPU_FREQ_TABLE=y





#

#

# CPUFreq processor drivers

# CPUFreq processor drivers
@@ -164,6 +167,7 @@ CONFIG_X86_ACPI_CPUFREQ=y 
# shared options

# shared options

#

#

CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y

CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y

# CONFIG_X86_SPEEDSTEP_LIB is not set





#

#

# Bus options (PCI etc.)

# Bus options (PCI etc.)
@@ -172,19 +176,17 @@ CONFIG_PCI=y 
CONFIG_PCI_DIRECT=y

CONFIG_PCI_DIRECT=y

CONFIG_PCI_MMCONFIG=y

CONFIG_PCI_MMCONFIG=y

CONFIG_UNORDERED_IO=y

CONFIG_UNORDERED_IO=y

# CONFIG_PCIEPORTBUS is not set

CONFIG_PCI_MSI=y

CONFIG_PCI_MSI=y

# CONFIG_PCI_LEGACY_PROC is not set

# CONFIG_PCI_LEGACY_PROC is not set

# CONFIG_PCI_NAMES is not set

# CONFIG_PCI_NAMES is not set

# CONFIG_PCI_DEBUG is not set





#

#

# PCCARD (PCMCIA/CardBus) support

# PCCARD (PCMCIA/CardBus) support

#

#

# CONFIG_PCCARD is not set

# CONFIG_PCCARD is not set





#

# PC-card bridges

#



#

#

# PCI Hotplug Support

# PCI Hotplug Support

#

#
@@ -254,7 +256,7 @@ CONFIG_LBD=y 
# IO Schedulers

# IO Schedulers

#

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

# CONFIG_IOSCHED_AS is not set

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

CONFIG_IOSCHED_CFQ=y

# CONFIG_ATA_OVER_ETH is not set

# CONFIG_ATA_OVER_ETH is not set
@@ -308,7 +310,8 @@ CONFIG_BLK_DEV_AMD74XX=y 
CONFIG_BLK_DEV_PIIX=y

CONFIG_BLK_DEV_PIIX=y

# CONFIG_BLK_DEV_NS87415 is not set

# CONFIG_BLK_DEV_NS87415 is not set

# CONFIG_BLK_DEV_PDC202XX_OLD is not set

# CONFIG_BLK_DEV_PDC202XX_OLD is not set

# CONFIG_BLK_DEV_PDC202XX_NEW is not set

CONFIG_BLK_DEV_PDC202XX_NEW=y

# CONFIG_PDC202XX_FORCE is not set

# CONFIG_BLK_DEV_SVWKS is not set

# CONFIG_BLK_DEV_SVWKS is not set

# CONFIG_BLK_DEV_SIIMAGE is not set

# CONFIG_BLK_DEV_SIIMAGE is not set

# CONFIG_BLK_DEV_SIS5513 is not set

# CONFIG_BLK_DEV_SIS5513 is not set
@@ -353,7 +356,7 @@ CONFIG_BLK_DEV_SD=y 
#

#

# SCSI low-level drivers

# SCSI low-level drivers

#

#

CONFIG_BLK_DEV_3W_XXXX_RAID=y

# CONFIG_BLK_DEV_3W_XXXX_RAID is not set

# CONFIG_SCSI_3W_9XXX is not set

# CONFIG_SCSI_3W_9XXX is not set

# CONFIG_SCSI_ACARD is not set

# CONFIG_SCSI_ACARD is not set

# CONFIG_SCSI_AACRAID is not set

# CONFIG_SCSI_AACRAID is not set
@@ -384,7 +387,6 @@ CONFIG_SCSI_SATA_VIA=y 
# CONFIG_SCSI_BUSLOGIC is not set

# CONFIG_SCSI_BUSLOGIC is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_EATA is not set

# CONFIG_SCSI_EATA is not set

# CONFIG_SCSI_EATA_PIO is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_GDTH is not set

# CONFIG_SCSI_GDTH is not set

# CONFIG_SCSI_IPS is not set

# CONFIG_SCSI_IPS is not set
@@ -392,7 +394,6 @@ CONFIG_SCSI_SATA_VIA=y 
# CONFIG_SCSI_INIA100 is not set

# CONFIG_SCSI_INIA100 is not set

# CONFIG_SCSI_SYM53C8XX_2 is not set

# CONFIG_SCSI_SYM53C8XX_2 is not set

# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_QLOGIC_ISP is not set

# CONFIG_SCSI_QLOGIC_FC is not set

# CONFIG_SCSI_QLOGIC_FC is not set

# CONFIG_SCSI_QLOGIC_1280 is not set

# CONFIG_SCSI_QLOGIC_1280 is not set

CONFIG_SCSI_QLA2XXX=y

CONFIG_SCSI_QLA2XXX=y
@@ -401,6 +402,7 @@ CONFIG_SCSI_QLA2XXX=y 
# CONFIG_SCSI_QLA2300 is not set

# CONFIG_SCSI_QLA2300 is not set

# CONFIG_SCSI_QLA2322 is not set

# CONFIG_SCSI_QLA2322 is not set

# CONFIG_SCSI_QLA6312 is not set

# CONFIG_SCSI_QLA6312 is not set

# CONFIG_SCSI_LPFC is not set

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set

# CONFIG_SCSI_DC390T is not set

# CONFIG_SCSI_DEBUG is not set

# CONFIG_SCSI_DEBUG is not set
@@ -437,7 +439,6 @@ CONFIG_NET=y 
#

#

CONFIG_PACKET=y

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

# CONFIG_PACKET_MMAP is not set

# CONFIG_NETLINK_DEV is not set

CONFIG_UNIX=y

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

CONFIG_INET=y
@@ -502,7 +503,7 @@ CONFIG_NETDEVICES=y 
# CONFIG_DUMMY is not set

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_BONDING is not set

# CONFIG_EQUALIZER is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

CONFIG_TUN=y





#

#

# ARCnet devices

# ARCnet devices
@@ -525,8 +526,7 @@ CONFIG_MII=y 
# CONFIG_HP100 is not set

# CONFIG_HP100 is not set

CONFIG_NET_PCI=y

CONFIG_NET_PCI=y

# CONFIG_PCNET32 is not set

# CONFIG_PCNET32 is not set

CONFIG_AMD8111_ETH=y

# CONFIG_AMD8111_ETH is not set

# CONFIG_AMD8111E_NAPI is not set

# CONFIG_ADAPTEC_STARFIRE is not set

# CONFIG_ADAPTEC_STARFIRE is not set

# CONFIG_B44 is not set

# CONFIG_B44 is not set

CONFIG_FORCEDETH=y

CONFIG_FORCEDETH=y
@@ -536,7 +536,7 @@ CONFIG_FORCEDETH=y 
# CONFIG_FEALNX is not set

# CONFIG_FEALNX is not set

# CONFIG_NATSEMI is not set

# CONFIG_NATSEMI is not set

# CONFIG_NE2K_PCI is not set

# CONFIG_NE2K_PCI is not set

CONFIG_8139CP=m

CONFIG_8139CP=y

CONFIG_8139TOO=y

CONFIG_8139TOO=y

# CONFIG_8139TOO_PIO is not set

# CONFIG_8139TOO_PIO is not set

# CONFIG_8139TOO_TUNE_TWISTER is not set

# CONFIG_8139TOO_TUNE_TWISTER is not set
@@ -671,6 +671,7 @@ CONFIG_SERIAL_8250_NR_UARTS=4 
#

#

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_JSM is not set

CONFIG_UNIX98_PTYS=y

CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

CONFIG_LEGACY_PTY_COUNT=256
@@ -696,6 +697,7 @@ CONFIG_RTC=y 
#

#

CONFIG_AGP=y

CONFIG_AGP=y

CONFIG_AGP_AMD64=y

CONFIG_AGP_AMD64=y

CONFIG_AGP_INTEL=y

# CONFIG_DRM is not set

# CONFIG_DRM is not set

# CONFIG_MWAVE is not set

# CONFIG_MWAVE is not set

CONFIG_RAW_DRIVER=y

CONFIG_RAW_DRIVER=y
@@ -703,7 +705,7 @@ CONFIG_HPET=y 
# CONFIG_HPET_RTC_IRQ is not set

# CONFIG_HPET_RTC_IRQ is not set

CONFIG_HPET_MMAP=y

CONFIG_HPET_MMAP=y

CONFIG_MAX_RAW_DEVS=256

CONFIG_MAX_RAW_DEVS=256

CONFIG_HANGCHECK_TIMER=y

# CONFIG_HANGCHECK_TIMER is not set





#

#

# TPM devices

# TPM devices
@@ -786,6 +788,8 @@ CONFIG_SOUND_ICH=y 
#

#

# USB support

# USB support

#

#

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB=y

CONFIG_USB=y

# CONFIG_USB_DEBUG is not set

# CONFIG_USB_DEBUG is not set
@@ -797,8 +801,6 @@ CONFIG_USB_DEVICEFS=y 
# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_SUSPEND is not set

# CONFIG_USB_SUSPEND is not set

# CONFIG_USB_OTG is not set

# CONFIG_USB_OTG is not set

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y





#

#

# USB Host Controller Drivers

# USB Host Controller Drivers
@@ -826,7 +828,6 @@ CONFIG_USB_PRINTER=y 
#

#

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE=y

# CONFIG_USB_STORAGE_DEBUG is not set

# CONFIG_USB_STORAGE_DEBUG is not set

# CONFIG_USB_STORAGE_RW_DETECT is not set

# CONFIG_USB_STORAGE_DATAFAB is not set

# CONFIG_USB_STORAGE_DATAFAB is not set

# CONFIG_USB_STORAGE_FREECOM is not set

# CONFIG_USB_STORAGE_FREECOM is not set

# CONFIG_USB_STORAGE_ISD200 is not set

# CONFIG_USB_STORAGE_ISD200 is not set
@@ -965,7 +966,7 @@ CONFIG_AUTOFS_FS=y 
# CD-ROM/DVD Filesystems

# CD-ROM/DVD Filesystems

#

#

CONFIG_ISO9660_FS=y

CONFIG_ISO9660_FS=y

# CONFIG_JOLIET is not set

CONFIG_JOLIET=y

# CONFIG_ZISOFS is not set

# CONFIG_ZISOFS is not set

# CONFIG_UDF_FS is not set

# CONFIG_UDF_FS is not set
@@ -1092,9 +1093,10 @@ CONFIG_OPROFILE=y 
#

#

# Kernel hacking

# Kernel hacking

#

#

# CONFIG_PRINTK_TIME is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_KERNEL=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_PRINTK_TIME is not set

CONFIG_LOG_BUF_SHIFT=18

# CONFIG_SCHEDSTATS is not set

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_SPINLOCK is not set