summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2011-09-08 11:44:04 -0400
committerChuck Ebbert <cebbert@redhat.com>2011-09-08 11:44:04 -0400
commite8bd9d2128adbd4bfc513e49798b5a2cdc66b68f (patch)
treeee91db75447a9c553dd47a436df11eccacbf5cad /config-x86-generic
parent9c94e213e1de9abdde3c010df2f8d08eba97ac6a (diff)
downloadkernel-e8bd9d2128adbd4bfc513e49798b5a2cdc66b68f.tar.gz
kernel-e8bd9d2128adbd4bfc513e49798b5a2cdc66b68f.tar.xz
kernel-e8bd9d2128adbd4bfc513e49798b5a2cdc66b68f.zip
Drop obsolete config options
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic15
1 files changed, 0 insertions, 15 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 0f1216ede..4437ccbb4 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -55,13 +55,11 @@ CONFIG_X86_MPPARSE=y
# CONFIG_DEBUG_PER_CPU_MAPS is not set
CONFIG_DEBUG_RODATA=y
CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_DEBUG_NMI_TIMEOUT=5
CONFIG_ACPI=y
CONFIG_ACPI_AC=y
# CONFIG_ACPI_ASUS is not set
CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_SYSFS_POWER=y
CONFIG_ACPI_BATTERY=y
CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_CONTAINER=m
@@ -69,7 +67,6 @@ CONFIG_ACPI_DOCK=y
CONFIG_ACPI_FAN=y
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_POWER=y
CONFIG_ACPI_PROCFS=y
CONFIG_ACPI_SBS=m
CONFIG_ACPI_SLEEP=y
@@ -78,7 +75,6 @@ CONFIG_ACPI_TOSHIBA=m
CONFIG_ACPI_VIDEO=m
# CONFIG_ACPI_PROC_EVENT is not set
CONFIG_PNPACPI=y
-CONFIG_ACPI_POWER_METER=m
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_HED=m
CONFIG_ACPI_APEI=y
@@ -246,7 +242,6 @@ CONFIG_XEN_SCRUB_PAGES=y
CONFIG_XEN_SAVE_RESTORE=y
CONFIG_HVC_XEN=y
CONFIG_XEN_FBDEV_FRONTEND=y
-CONFIG_XEN_KBDDEV_FRONTEND=y
CONFIG_XEN_BLKDEV_FRONTEND=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_XEN_NETDEV_BACKEND=m
@@ -295,7 +290,6 @@ CONFIG_INTEL_IOATDMA=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_FAM15H_POWER=m
CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_PKGTEMP=m
# CONFIG_CPA_DEBUG is not set
@@ -310,31 +304,24 @@ CONFIG_STRICT_DEVMEM=y
# CONFIG_MEMTEST is not set
# CONFIG_MAXSMP is not set
-CONFIG_SYSPROF_TRACER=y
CONFIG_HP_ILO=m
CONFIG_BACKLIGHT_APPLE=m
-CONFIG_OPROFILE_IBS=y
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW_64K=y
# CONFIG_CMDLINE_BOOL is not set
-CONFIG_X86_PTRACE_BTS=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_POWER_TRACER=y
-CONFIG_HW_BRANCH_TRACER=y
# CONFIG_IOMMU_STRESS is not set
CONFIG_PERF_COUNTERS=y
CONFIG_PERF_EVENTS=y
-CONFIG_EVENT_PROFILE=y
CONFIG_X86_MCE=y
CONFIG_X86_MCE_INTEL=y
@@ -343,7 +330,6 @@ CONFIG_X86_MCE_AMD=y
CONFIG_SFI=y
-CONFIG_INPUT_WINBOND_CIR=m
CONFIG_I2C_SCMI=m
CONFIG_SBC_FITPC2_WATCHDOG=m
@@ -361,7 +347,6 @@ CONFIG_PCI_CNB20LE_QUIRK=y
CONFIG_ACPI_EC_DEBUGFS=m
# CONFIG_ACPI_APEI_ERST_DEBUG is not set
# CONFIG_ACPI_QUICKSTART is not set
-CONFIG_IDEAPAD_ACPI=m
CONFIG_INTEL_IDLE=y