diff options
-rw-r--r-- | drivers/acpi/bus.c | 8 | ||||
-rw-r--r-- | include/acpi/actypes.h | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 437ddbf0c49a..9ecec98bc76e 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
@@ -911,10 +911,7 @@ void __init acpi_early_init(void) | |||
911 | } | 911 | } |
912 | #endif | 912 | #endif |
913 | 913 | ||
914 | status = | 914 | status = acpi_enable_subsystem(~ACPI_NO_ACPI_ENABLE); |
915 | acpi_enable_subsystem(~ | ||
916 | (ACPI_NO_HARDWARE_INIT | | ||
917 | ACPI_NO_ACPI_ENABLE)); | ||
918 | if (ACPI_FAILURE(status)) { | 915 | if (ACPI_FAILURE(status)) { |
919 | printk(KERN_ERR PREFIX "Unable to enable ACPI\n"); | 916 | printk(KERN_ERR PREFIX "Unable to enable ACPI\n"); |
920 | goto error0; | 917 | goto error0; |
@@ -935,8 +932,7 @@ static int __init acpi_bus_init(void) | |||
935 | 932 | ||
936 | acpi_os_initialize1(); | 933 | acpi_os_initialize1(); |
937 | 934 | ||
938 | status = | 935 | status = acpi_enable_subsystem(ACPI_NO_ACPI_ENABLE); |
939 | acpi_enable_subsystem(ACPI_NO_HARDWARE_INIT | ACPI_NO_ACPI_ENABLE); | ||
940 | if (ACPI_FAILURE(status)) { | 936 | if (ACPI_FAILURE(status)) { |
941 | printk(KERN_ERR PREFIX | 937 | printk(KERN_ERR PREFIX |
942 | "Unable to start the ACPI Interpreter\n"); | 938 | "Unable to start the ACPI Interpreter\n"); |
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index b67231bef632..ed73f6705c86 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
@@ -470,7 +470,6 @@ typedef u64 acpi_integer; | |||
470 | */ | 470 | */ |
471 | #define ACPI_FULL_INITIALIZATION 0x00 | 471 | #define ACPI_FULL_INITIALIZATION 0x00 |
472 | #define ACPI_NO_ADDRESS_SPACE_INIT 0x01 | 472 | #define ACPI_NO_ADDRESS_SPACE_INIT 0x01 |
473 | #define ACPI_NO_HARDWARE_INIT 0x02 | ||
474 | #define ACPI_NO_EVENT_INIT 0x04 | 473 | #define ACPI_NO_EVENT_INIT 0x04 |
475 | #define ACPI_NO_HANDLER_INIT 0x08 | 474 | #define ACPI_NO_HANDLER_INIT 0x08 |
476 | #define ACPI_NO_ACPI_ENABLE 0x10 | 475 | #define ACPI_NO_ACPI_ENABLE 0x10 |