aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-25 12:08:25 -0400
committerLen Brown <len.brown@intel.com>2005-08-25 12:14:20 -0400
commiteb7b6b32644f7a48357e02f8004f88b3220f3494 (patch)
treefff8771a500c1a28cb29490aa9722f061e16c1eb /arch
parent76f58584824c61eb5b3bdbf019236815921d2e7c (diff)
[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')
-rw-r--r--arch/ia64/Kconfig32
-rw-r--r--arch/ia64/configs/bigsur_defconfig2
-rw-r--r--arch/ia64/configs/sn2_defconfig3
-rw-r--r--arch/ia64/configs/tiger_defconfig3
-rw-r--r--arch/ia64/configs/zx1_defconfig3
-rw-r--r--arch/ia64/defconfig2
6 files changed, 3 insertions, 42 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 80988136f26d..addf07393ef4 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -60,6 +60,7 @@ choice
60 60
61config IA64_GENERIC 61config IA64_GENERIC
62 bool "generic" 62 bool "generic"
63 select ACPI
63 select NUMA 64 select NUMA
64 select ACPI_NUMA 65 select ACPI_NUMA
65 select VIRTUAL_MEM_MAP 66 select VIRTUAL_MEM_MAP
@@ -340,6 +341,7 @@ config IA64_PALINFO
340 341
341config ACPI_DEALLOCATE_IRQ 342config ACPI_DEALLOCATE_IRQ
342 bool 343 bool
344 depends on ACPI
343 depends on IOSAPIC && EXPERIMENTAL 345 depends on IOSAPIC && EXPERIMENTAL
344 default y 346 default y
345 347
@@ -351,38 +353,10 @@ endmenu
351 353
352menu "Power management and ACPI" 354menu "Power management and ACPI"
353 355
354config PM 356source "kernel/power/Kconfig"
355 bool "Power Management support"
356 depends on !IA64_HP_SIM
357 default y
358 help
359 "Power Management" means that parts of your computer are shut
360 off or put into a power conserving "sleep" mode if they are not
361 being used. There are two competing standards for doing this: APM
362 and ACPI. If you want to use either one, say Y here and then also
363 to the requisite support below.
364
365 Power Management is most important for battery powered laptop
366 computers; if you have a laptop, check out the Linux Laptop home
367 page on the WWW at <http://www.linux-on-laptops.com/> and the
368 Battery Powered Linux mini-HOWTO, available from
369 <http://www.tldp.org/docs.html#howto>.
370
371 Note that, even if you say N here, Linux on the x86 architecture
372 will issue the hlt instruction if nothing is to be done, thereby
373 sending the processor to sleep and saving power.
374
375config ACPI
376 bool
377 depends on !IA64_HP_SIM
378 default y
379
380if !IA64_HP_SIM
381 357
382source "drivers/acpi/Kconfig" 358source "drivers/acpi/Kconfig"
383 359
384endif
385
386endmenu 360endmenu
387 361
388if !IA64_HP_SIM 362if !IA64_HP_SIM
diff --git a/arch/ia64/configs/bigsur_defconfig b/arch/ia64/configs/bigsur_defconfig
index 996144e840d3..71dcfe0e3f73 100644
--- a/arch/ia64/configs/bigsur_defconfig
+++ b/arch/ia64/configs/bigsur_defconfig
@@ -108,11 +108,9 @@ CONFIG_ACPI=y
108# ACPI (Advanced Configuration and Power Interface) Support 108# ACPI (Advanced Configuration and Power Interface) Support
109# 109#
110CONFIG_ACPI_BUTTON=m 110CONFIG_ACPI_BUTTON=m
111CONFIG_ACPI_VIDEO=m
112CONFIG_ACPI_FAN=m 111CONFIG_ACPI_FAN=m
113CONFIG_ACPI_PROCESSOR=m 112CONFIG_ACPI_PROCESSOR=m
114CONFIG_ACPI_THERMAL=m 113CONFIG_ACPI_THERMAL=m
115CONFIG_ACPI_BLACKLIST_YEAR=0
116# CONFIG_ACPI_DEBUG is not set 114# CONFIG_ACPI_DEBUG is not set
117CONFIG_ACPI_POWER=y 115CONFIG_ACPI_POWER=y
118CONFIG_ACPI_PCI=y 116CONFIG_ACPI_PCI=y
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig
index 4644ebea8eab..ac17ed2ff979 100644
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
@@ -131,12 +131,9 @@ CONFIG_ACPI=y
131# ACPI (Advanced Configuration and Power Interface) Support 131# ACPI (Advanced Configuration and Power Interface) Support
132# 132#
133# CONFIG_ACPI_BUTTON is not set 133# CONFIG_ACPI_BUTTON is not set
134CONFIG_ACPI_VIDEO=m
135CONFIG_ACPI_HOTKEY=m
136# CONFIG_ACPI_FAN is not set 134# CONFIG_ACPI_FAN is not set
137# CONFIG_ACPI_PROCESSOR is not set 135# CONFIG_ACPI_PROCESSOR is not set
138CONFIG_ACPI_NUMA=y 136CONFIG_ACPI_NUMA=y
139CONFIG_ACPI_BLACKLIST_YEAR=0
140# CONFIG_ACPI_DEBUG is not set 137# CONFIG_ACPI_DEBUG is not set
141CONFIG_ACPI_POWER=y 138CONFIG_ACPI_POWER=y
142CONFIG_ACPI_PCI=y 139CONFIG_ACPI_PCI=y
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index f5fa113f302d..3a629414229e 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@ -129,13 +129,10 @@ CONFIG_ACPI=y
129# ACPI (Advanced Configuration and Power Interface) Support 129# ACPI (Advanced Configuration and Power Interface) Support
130# 130#
131CONFIG_ACPI_BUTTON=m 131CONFIG_ACPI_BUTTON=m
132# CONFIG_ACPI_VIDEO is not set
133# CONFIG_ACPI_HOTKEY is not set
134CONFIG_ACPI_FAN=m 132CONFIG_ACPI_FAN=m
135CONFIG_ACPI_PROCESSOR=m 133CONFIG_ACPI_PROCESSOR=m
136# CONFIG_ACPI_HOTPLUG_CPU is not set 134# CONFIG_ACPI_HOTPLUG_CPU is not set
137CONFIG_ACPI_THERMAL=m 135CONFIG_ACPI_THERMAL=m
138CONFIG_ACPI_BLACKLIST_YEAR=0
139# CONFIG_ACPI_DEBUG is not set 136# CONFIG_ACPI_DEBUG is not set
140CONFIG_ACPI_POWER=y 137CONFIG_ACPI_POWER=y
141CONFIG_ACPI_PCI=y 138CONFIG_ACPI_PCI=y
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig
index 1e6d286ad0f3..84cdf32ede7c 100644
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
@@ -129,12 +129,9 @@ CONFIG_ACPI=y
129# ACPI (Advanced Configuration and Power Interface) Support 129# ACPI (Advanced Configuration and Power Interface) Support
130# 130#
131CONFIG_ACPI_BUTTON=y 131CONFIG_ACPI_BUTTON=y
132CONFIG_ACPI_VIDEO=m
133CONFIG_ACPI_HOTKEY=m
134CONFIG_ACPI_FAN=y 132CONFIG_ACPI_FAN=y
135CONFIG_ACPI_PROCESSOR=y 133CONFIG_ACPI_PROCESSOR=y
136CONFIG_ACPI_THERMAL=y 134CONFIG_ACPI_THERMAL=y
137CONFIG_ACPI_BLACKLIST_YEAR=0
138# CONFIG_ACPI_DEBUG is not set 135# CONFIG_ACPI_DEBUG is not set
139CONFIG_ACPI_POWER=y 136CONFIG_ACPI_POWER=y
140CONFIG_ACPI_PCI=y 137CONFIG_ACPI_PCI=y
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 163ef12641b7..7002d5a3cc14 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -119,13 +119,11 @@ CONFIG_ACPI=y
119# ACPI (Advanced Configuration and Power Interface) Support 119# ACPI (Advanced Configuration and Power Interface) Support
120# 120#
121CONFIG_ACPI_BUTTON=m 121CONFIG_ACPI_BUTTON=m
122CONFIG_ACPI_VIDEO=m
123CONFIG_ACPI_FAN=m 122CONFIG_ACPI_FAN=m
124CONFIG_ACPI_PROCESSOR=m 123CONFIG_ACPI_PROCESSOR=m
125CONFIG_ACPI_HOTPLUG_CPU=y 124CONFIG_ACPI_HOTPLUG_CPU=y
126CONFIG_ACPI_THERMAL=m 125CONFIG_ACPI_THERMAL=m
127CONFIG_ACPI_NUMA=y 126CONFIG_ACPI_NUMA=y
128CONFIG_ACPI_BLACKLIST_YEAR=0
129# CONFIG_ACPI_DEBUG is not set 127# CONFIG_ACPI_DEBUG is not set
130CONFIG_ACPI_POWER=y 128CONFIG_ACPI_POWER=y
131CONFIG_ACPI_PCI=y 129CONFIG_ACPI_PCI=y