summaryrefslogtreecommitdiff
path: root/arch/ia64/configs/zx1_defconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-25 16:08:25 (GMT)
committerLen Brown <len.brown@intel.com>2005-08-25 16:14:20 (GMT)
commiteb7b6b32644f7a48357e02f8004f88b3220f3494 (patch)
treefff8771a500c1a28cb29490aa9722f061e16c1eb /arch/ia64/configs/zx1_defconfig
parent76f58584824c61eb5b3bdbf019236815921d2e7c (diff)
downloadlinux-fsl-qoriq-eb7b6b32644f7a48357e02f8004f88b3220f3494.tar.xz
[ACPI] IA64-related ACPI Kconfig fixes
Build issues were mostly in the ACPI=n case -- don't do that. Select ACPI from IA64_GENERIC. Add some missing dependencies on ACPI. Mark BLACKLIST_YEAR and some laptop-only ACPI drivers as X86-only. Let me know when you get an IA64 Laptop. Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64/configs/zx1_defconfig')
-rw-r--r--arch/ia64/configs/zx1_defconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig
index 1e6d286..84cdf32 100644
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
@@ -129,12 +129,9 @@ 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