From ce3f65b4fe255b6ac965e662cd5700db0bb04869 Mon Sep 17 00:00:00 2001 From: Toshi Kani Date: Mon, 11 Feb 2013 22:33:20 +0000 Subject: [PATCH] --- yaml --- r: 350982 b: refs/heads/master c: 64fd7401c5e4cf7c64452ecd9b700a55a5ebea50 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/acpi.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 295792af6031..ee2835b36b75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0aa120a0138398d6597350f4c1dcb46d14be1a0b +refs/heads/master: 64fd7401c5e4cf7c64452ecd9b700a55a5ebea50 diff --git a/trunk/include/linux/acpi.h b/trunk/include/linux/acpi.h index c6ccd9fa8f08..bcbdd7484e58 100644 --- a/trunk/include/linux/acpi.h +++ b/trunk/include/linux/acpi.h @@ -363,8 +363,7 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, #if defined(CONFIG_ACPI_HOTPLUG_CPU) && \ (defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \ defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) && \ - (defined(CONFIG_ACPI_CONTAINER) || \ - defined(CONFIG_ACPI_CONTAINER_MODULE)) + defined(CONFIG_ACPI_CONTAINER) #define ACPI_HOTPLUG_OST #endif