From 37cabc81640ddba28a2aa7f0d1286a1012eae248 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Sat, 27 Jan 2007 01:55:18 -0500 Subject: [PATCH 1/3] ACPI: Correct ACPI_DEBUG_OUTPUT typo -#ifdef CONFIG_ACPI_DEBUG_OUTPUT +#ifdef ACPI_DEBUG_OUTPUT As the former doesn't exist. Signed-off-by: Robert P. J. Day Signed-off-by: Len Brown --- drivers/acpi/scan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 283d87522c5d..0bd788a64eb3 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -891,7 +891,7 @@ static int acpi_device_set_context(struct acpi_device *device, int type) static void acpi_device_get_debug_info(struct acpi_device *device, acpi_handle handle, int type) { -#ifdef CONFIG_ACPI_DEBUG_OUTPUT +#ifdef ACPI_DEBUG_OUTPUT char *type_string = NULL; char name[80] = { '?', '\0' }; struct acpi_buffer buffer = { sizeof(name), name }; @@ -928,7 +928,7 @@ static void acpi_device_get_debug_info(struct acpi_device *device, } printk(KERN_DEBUG "Found %s %s [%p]\n", type_string, name, handle); -#endif /*CONFIG_ACPI_DEBUG_OUTPUT */ +#endif /* ACPI_DEBUG_OUTPUT */ } static int acpi_bus_remove(struct acpi_device *dev, int rmdevice) From 7ac2735462349ca35d8807d93d66cf4d9ea7b729 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Tue, 30 Jan 2007 02:13:44 -0500 Subject: [PATCH 2/3] ACPI: delete unused acpi_device_get_debug_info() Signed-off-by: Len Brown --- drivers/acpi/scan.c | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 0bd788a64eb3..2e0fc8c3b58b 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -888,49 +888,6 @@ static int acpi_device_set_context(struct acpi_device *device, int type) return result; } -static void acpi_device_get_debug_info(struct acpi_device *device, - acpi_handle handle, int type) -{ -#ifdef ACPI_DEBUG_OUTPUT - char *type_string = NULL; - char name[80] = { '?', '\0' }; - struct acpi_buffer buffer = { sizeof(name), name }; - - switch (type) { - case ACPI_BUS_TYPE_DEVICE: - type_string = "Device"; - acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer); - break; - case ACPI_BUS_TYPE_POWER: - type_string = "Power Resource"; - acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer); - break; - case ACPI_BUS_TYPE_PROCESSOR: - type_string = "Processor"; - acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer); - break; - case ACPI_BUS_TYPE_SYSTEM: - type_string = "System"; - acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer); - break; - case ACPI_BUS_TYPE_THERMAL: - type_string = "Thermal Zone"; - acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer); - break; - case ACPI_BUS_TYPE_POWER_BUTTON: - type_string = "Power Button"; - sprintf(name, "PWRB"); - break; - case ACPI_BUS_TYPE_SLEEP_BUTTON: - type_string = "Sleep Button"; - sprintf(name, "SLPB"); - break; - } - - printk(KERN_DEBUG "Found %s %s [%p]\n", type_string, name, handle); -#endif /* ACPI_DEBUG_OUTPUT */ -} - static int acpi_bus_remove(struct acpi_device *dev, int rmdevice) { int result = 0; @@ -1076,8 +1033,6 @@ acpi_add_single_object(struct acpi_device **child, if ((result = acpi_device_set_context(device, type))) goto end; - acpi_device_get_debug_info(device, handle, type); - acpi_device_register(device, parent); /* From db50342205deabaff9ce1fbe53d5ba351992fa08 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Fri, 2 Feb 2007 21:05:04 -0500 Subject: [PATCH 3/3] ACPI: prevent build failure when CONFIG_X86_NUMAQ=y ...by disabling CONFIG_ACPI when CONFIG_X86_NUMAQ=y otherwise arch/i386/pci/Makefile forgets that it needs to build acpi.o drivers/built-in.o: In function `acpi_pci_root_add': pci_root.c:(.text+0x45ec4): undefined reference to `pci_acpi_scan_root' Signed-off-by: Len Brown --- drivers/acpi/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index f4f000abc4e9..b61a0632b351 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -3,6 +3,7 @@ # menu "ACPI (Advanced Configuration and Power Interface) Support" + depends on !X86_NUMAQ depends on !X86_VISWS depends on !IA64_HP_SIM depends on IA64 || X86