[PATCH] ppc32: update xmon help text
[linux-3.10.git] / arch / ia64 / configs / zx1_defconfig
index 1e6d286ad0f33f22f4a3c296fd5a62f5783e30ac..80b0e9eb7fb3d0ae2852d085f73ce3d2421e2146 100644 (file)
@@ -109,7 +109,6 @@ CONFIG_COMPAT=y
 CONFIG_IA64_MCA_RECOVERY=y
 CONFIG_PERFMON=y
 CONFIG_IA64_PALINFO=y
-CONFIG_ACPI_DEALLOCATE_IRQ=y
 
 #
 # Firmware Drivers
@@ -129,15 +128,11 @@ CONFIG_ACPI=y
 # ACPI (Advanced Configuration and Power Interface) Support
 #
 CONFIG_ACPI_BUTTON=y
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_HOTKEY=m
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
 CONFIG_ACPI_SYSTEM=y
 # CONFIG_ACPI_CONTAINER is not set