From: Pavel M. <pa...@uc...> - 2002-06-07 19:11:45
|
Hi! This makes CONFIG_ACPI_BOOT optional. Omnibook xe3 will not boot with CONFIG_ACPI_BOOT, interesting parts are done before blacklist has chance to stop it... Please apply, Pavel --- linux-swsusp.test/arch/i386/kernel/acpi.c Mon Jun 3 18:42:59 2002 +++ linux-swsusp/arch/i386/kernel/acpi.c Fri Jun 7 14:01:14 2002 @@ -53,11 +53,9 @@ Boot-time Configuration -------------------------------------------------------------------------- */ -#ifdef CONFIG_ACPI_BOOT - enum acpi_irq_model_id acpi_irq_model; - +#ifdef CONFIG_ACPI_BOOT /* * Use reserved fixmap pages for physical-to-virtual mappings of ACPI tables. * Note that the same range is used for each table, so tables that need to --- linux-swsusp.test/drivers/acpi/Config.in Mon Jun 3 18:40:40 2002 +++ linux-swsusp/drivers/acpi/Config.in Fri Jun 7 13:39:03 2002 @@ -12,10 +12,9 @@ bool 'CPU Enumeration Only' CONFIG_ACPI_HT_ONLY fi - if [ "$CONFIG_ACPI_HT_ONLY" = "y" ]; then - define_bool CONFIG_ACPI_BOOT y - else - define_bool CONFIG_ACPI_BOOT y + bool 'Boot using acpi' CONFIG_ACPI_BOOT + + if [ "$CONFIG_ACPI_HT_ONLY" != "y" ]; then define_bool CONFIG_ACPI_BUS y define_bool CONFIG_ACPI_INTERPRETER y define_bool CONFIG_ACPI_EC y --- linux-swsusp.test/drivers/acpi/bus.c Mon Jun 3 18:40:42 2002 +++ linux-swsusp/drivers/acpi/bus.c Fri Jun 7 13:44:59 2002 @@ -32,6 +32,7 @@ #include <linux/sched.h> #include <linux/pm.h> #include <linux/proc_fs.h> +#include <linux/acpi.h> #include "acpi_bus.h" #include "acpi_drivers.h" #include "include/acinterp.h" /* for acpi_ex_eisa_id_to_string() */ --- linux-swsusp.test/include/linux/acpi.h Thu Jun 6 22:59:21 2002 +++ linux-swsusp/include/linux/acpi.h Fri Jun 7 13:46:14 2002 @@ -39,7 +39,7 @@ #include <asm/acpi.h> -#ifdef CONFIG_ACPI_BOOT +#ifdef CONFIG_ACPI enum acpi_irq_model_id { ACPI_IRQ_MODEL_PIC = 0, -- (about SSSCA) "I don't say this lightly. However, I really think that the U.S. no longer is classifiable as a democracy, but rather as a plutocracy." --hpa |