Commit 3177bcb8 authored by Andy Grover's avatar Andy Grover Committed by Linus Torvalds

[PATCH] ACPI patch 4/9

This is the config.in and makefile changes for the latest code. The most
(only) interesting thing probably is ACPI is no longer flagged experimental.
parent 7107bb3b
...@@ -208,6 +208,8 @@ endmenu ...@@ -208,6 +208,8 @@ endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'General options' comment 'General options'
source drivers/acpi/Config.in
# Visual Workstation support is utterly broken. # Visual Workstation support is utterly broken.
# If you want to see it working mail an VW540 to hch@infradead.org 8) # If you want to see it working mail an VW540 to hch@infradead.org 8)
#bool 'SGI Visual Workstation support' CONFIG_VISWS #bool 'SGI Visual Workstation support' CONFIG_VISWS
...@@ -266,14 +268,6 @@ tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC ...@@ -266,14 +268,6 @@ tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
bool 'Power Management support' CONFIG_PM bool 'Power Management support' CONFIG_PM
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
dep_bool ' ACPI support' CONFIG_ACPI $CONFIG_PM
if [ "$CONFIG_ACPI" != "n" ]; then
source drivers/acpi/Config.in
fi
fi
dep_tristate ' Advanced Power Management BIOS support' CONFIG_APM $CONFIG_PM dep_tristate ' Advanced Power Management BIOS support' CONFIG_APM $CONFIG_PM
if [ "$CONFIG_APM" != "n" ]; then if [ "$CONFIG_APM" != "n" ]; then
bool ' Ignore USER SUSPEND' CONFIG_APM_IGNORE_USER_SUSPEND bool ' Ignore USER SUSPEND' CONFIG_APM_IGNORE_USER_SUSPEND
......
...@@ -36,9 +36,11 @@ obj-$(CONFIG_X86_MSR) += msr.o ...@@ -36,9 +36,11 @@ obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_X86_CPUID) += cpuid.o obj-$(CONFIG_X86_CPUID) += cpuid.o
obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_MICROCODE) += microcode.o
obj-$(CONFIG_APM) += apm.o obj-$(CONFIG_APM) += apm.o
obj-$(CONFIG_ACPI) += acpi.o
obj-$(CONFIG_ACPI_SLEEP) += acpi_wakeup.o
obj-$(CONFIG_SMP) += smp.o smpboot.o trampoline.o obj-$(CONFIG_SMP) += smp.o smpboot.o trampoline.o
obj-$(CONFIG_X86_LOCAL_APIC) += mpparse.o apic.o nmi.o obj-$(CONFIG_X86_LOCAL_APIC) += mpparse.o apic.o nmi.o
obj-$(CONFIG_X86_IO_APIC) += io_apic.o acpitable.o obj-$(CONFIG_X86_IO_APIC) += io_apic.o
ifdef CONFIG_VISWS ifdef CONFIG_VISWS
obj-y += setup-visws.o obj-y += setup-visws.o
obj-$(CONFIG_X86_VISWS_APIC) += visws_apic.o obj-$(CONFIG_X86_VISWS_APIC) += visws_apic.o
......
# #
# ACPI configuration # ACPI Configuration
# #
#mainmenu_option next_comment if [ "$CONFIG_X86" = "y" ]; then
#comment 'ACPI Configuration' mainmenu_option next_comment
comment 'ACPI Support'
dep_bool 'ACPI Support' CONFIG_ACPI $CONFIG_PCI
if [ "$CONFIG_ACPI" = "y" ]; then
define_bool CONFIG_ACPI_BOOT y
define_bool CONFIG_ACPI_BUS y
define_bool CONFIG_ACPI_EC y
define_bool CONFIG_ACPI_INTERPRETER y
define_bool CONFIG_ACPI_PCI y
define_bool CONFIG_ACPI_POWER y
define_bool CONFIG_ACPI_SLEEP y
define_bool CONFIG_ACPI_SYSTEM y
tristate ' AC Adapter' CONFIG_ACPI_AC
tristate ' Battery' CONFIG_ACPI_BATTERY
tristate ' Button' CONFIG_ACPI_BUTTON
tristate ' Fan' CONFIG_ACPI_FAN
tristate ' Processor' CONFIG_ACPI_PROCESSOR
dep_tristate ' Thermal Zone' CONFIG_ACPI_THERMAL $CONFIG_ACPI_PROCESSOR
bool ' Debug Statements' CONFIG_ACPI_DEBUG
fi
endmenu
fi
dep_bool ' ACPI Debug Statements' CONFIG_ACPI_DEBUG $CONFIG_ACPI if [ "$CONFIG_IA64" = "y" ]; then
dep_tristate ' ACPI Bus Manager' CONFIG_ACPI_BUSMGR $CONFIG_ACPI if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
mainmenu_option next_comment
dep_tristate ' System' CONFIG_ACPI_SYS $CONFIG_ACPI_BUSMGR $CONFIG_ACPI comment 'ACPI Support'
dep_tristate ' Processor' CONFIG_ACPI_CPU $CONFIG_ACPI_BUSMGR $CONFIG_ACPI define_bool CONFIG_ACPI y
dep_tristate ' Button' CONFIG_ACPI_BUTTON $CONFIG_ACPI_BUSMGR $CONFIG_ACPI define_bool CONFIG_ACPI_EFI y
dep_tristate ' AC Adapter' CONFIG_ACPI_AC $CONFIG_ACPI_BUSMGR $CONFIG_ACPI define_bool CONFIG_ACPI_BOOT y
dep_tristate ' Embedded Controller' CONFIG_ACPI_EC $CONFIG_ACPI_BUSMGR $CONFIG_ACPI define_bool CONFIG_ACPI_BUS y
dep_tristate ' Control Method Battery' CONFIG_ACPI_CMBATT $CONFIG_ACPI_BUSMGR $CONFIG_ACPI $CONFIG_ACPI_EC define_bool CONFIG_ACPI_INTERPRETER y
dep_tristate ' Thermal' CONFIG_ACPI_THERMAL $CONFIG_ACPI_BUSMGR $CONFIG_ACPI $CONFIG_ACPI_EC define_bool CONFIG_ACPI_PCI y
#endmenu define_bool CONFIG_ACPI_POWER y
define_bool CONFIG_ACPI_SYSTEM y
tristate ' Button' CONFIG_ACPI_BUTTON
tristate ' Fan' CONFIG_ACPI_FAN
tristate ' Processor' CONFIG_ACPI_PROCESSOR
dep_tristate ' Thermal Zone' CONFIG_ACPI_THERMAL $CONFIG_ACPI_PROCESSOR
bool ' Debug Statements' CONFIG_ACPI_DEBUG
endmenu
fi
fi
...@@ -4,51 +4,52 @@ ...@@ -4,51 +4,52 @@
O_TARGET := acpi.o O_TARGET := acpi.o
export-objs := acpi_ksyms.o
export ACPI_CFLAGS export ACPI_CFLAGS
ACPI_CFLAGS := -D_LINUX -I$(CURDIR)/include ACPI_CFLAGS := -D_LINUX -I$(CURDIR)/include
#
# CONFIG_ACPI_KERNEL_CONFIG is currently only IA64
#
ifdef CONFIG_ACPI_KERNEL_CONFIG
ACPI_CFLAGS += -DCONFIG_ACPI_KERNEL_CONFIG_ONLY
endif
acpi-subdirs := utilities dispatcher events hardware \
executer namespace parser resources tables
ifdef CONFIG_ACPI_DEBUG ifdef CONFIG_ACPI_DEBUG
ACPI_CFLAGS += -DACPI_DEBUG -Wno-unused ACPI_CFLAGS += -DACPI_DEBUG -Wno-unused
endif endif
ifdef CONFIG_ACPI_DEBUGGER
ACPI_CFLAGS += -DENABLE_DEBUGGER
acpi-subdirs += debugger
endif
EXTRA_CFLAGS += $(ACPI_CFLAGS) EXTRA_CFLAGS += $(ACPI_CFLAGS)
mod-subdirs := ospm export-objs := acpi_ksyms.o
subdir-$(CONFIG_ACPI) += $(acpi-subdirs) obj-y := acpi_ksyms.o
subdir-$(CONFIG_ACPI_BUSMGR) += ospm
obj-$(CONFIG_ACPI) += driver.o os.o acpi_ksyms.o #
obj-$(CONFIG_ACPI) += $(foreach dir,$(acpi-subdirs),$(dir)/$(dir).o) # ACPI Boot-Time Table Parsing
ifdef CONFIG_ACPI_KERNEL_CONFIG #
obj-$(CONFIG_ACPI) += acpiconf.o osconf.o ifeq ($(CONFIG_ACPI_BOOT),y)
obj-y += acpi_tables.o
endif endif
ifeq ($(CONFIG_ACPI_BUSMGR),y) #
obj-y += ospm/ospm.o # ACPI Core Subsystem (Interpreter)
#
ifeq ($(CONFIG_ACPI_INTERPRETER),y)
obj-y += acpi_osl.o acpi_utils.o
subdir-y += dispatcher events executer hardware namespace parser \
resources tables utilities
obj-y += $(foreach dir,$(subdir-y),$(dir)/$(dir).o)
endif endif
# commented out until we distribute it -ASG #
#ifeq ($(CONFIG_KDB),y) # ACPI Bus and Device Drivers
# obj-m += kdb/kdbm_acpi.o #
#endif ifeq ($(CONFIG_ACPI_BUS),y)
obj-y += acpi_bus.o
obj-$(CONFIG_ACPI_AC) += acpi_ac.o
obj-$(CONFIG_ACPI_BATTERY) += acpi_battery.o
obj-$(CONFIG_ACPI_BUTTON) += acpi_button.o
obj-$(CONFIG_ACPI_EC) += acpi_ec.o
obj-$(CONFIG_ACPI_FAN) += acpi_fan.o
obj-$(CONFIG_ACPI_PCI) += acpi_pci_root.o acpi_pci_link.o
obj-$(CONFIG_ACPI_POWER) += acpi_power.o
obj-$(CONFIG_ACPI_PROCESSOR) += acpi_processor.o
obj-$(CONFIG_ACPI_THERMAL) += acpi_thermal.o
obj-$(CONFIG_ACPI_SYSTEM) += acpi_system.o
endif
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment