From 7da4330cf8857f6d71158eb8db062f6d5ead4e6b Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Sun, 6 Nov 2011 14:20:42 +0100 Subject: [PATCH] --- yaml --- r: 275024 b: refs/heads/master c: 4505a2015f4c4b2f21137cc3a6b7400b0f3e073e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/bus.c | 8 ++------ trunk/include/acpi/actypes.h | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 556514c86b36..493d3a8c5064 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 581de59e8dff8eaa52809e768a585e9ef336aa4a +refs/heads/master: 4505a2015f4c4b2f21137cc3a6b7400b0f3e073e diff --git a/trunk/drivers/acpi/bus.c b/trunk/drivers/acpi/bus.c index 437ddbf0c49a..9ecec98bc76e 100644 --- a/trunk/drivers/acpi/bus.c +++ b/trunk/drivers/acpi/bus.c @@ -911,10 +911,7 @@ void __init acpi_early_init(void) } #endif - status = - acpi_enable_subsystem(~ - (ACPI_NO_HARDWARE_INIT | - ACPI_NO_ACPI_ENABLE)); + status = acpi_enable_subsystem(~ACPI_NO_ACPI_ENABLE); if (ACPI_FAILURE(status)) { printk(KERN_ERR PREFIX "Unable to enable ACPI\n"); goto error0; @@ -935,8 +932,7 @@ static int __init acpi_bus_init(void) acpi_os_initialize1(); - status = - acpi_enable_subsystem(ACPI_NO_HARDWARE_INIT | ACPI_NO_ACPI_ENABLE); + status = acpi_enable_subsystem(ACPI_NO_ACPI_ENABLE); if (ACPI_FAILURE(status)) { printk(KERN_ERR PREFIX "Unable to start the ACPI Interpreter\n"); diff --git a/trunk/include/acpi/actypes.h b/trunk/include/acpi/actypes.h index b67231bef632..ed73f6705c86 100644 --- a/trunk/include/acpi/actypes.h +++ b/trunk/include/acpi/actypes.h @@ -470,7 +470,6 @@ typedef u64 acpi_integer; */ #define ACPI_FULL_INITIALIZATION 0x00 #define ACPI_NO_ADDRESS_SPACE_INIT 0x01 -#define ACPI_NO_HARDWARE_INIT 0x02 #define ACPI_NO_EVENT_INIT 0x04 #define ACPI_NO_HANDLER_INIT 0x08 #define ACPI_NO_ACPI_ENABLE 0x10