| Message ID | 1360622000-22140-1-git-send-email-toshi.kani@hp.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Tue, 2013-02-12 at 00:22 +0100, Rafael J. Wysocki wrote: > On Monday, February 11, 2013 03:33:20 PM Toshi Kani wrote: > > config ACPI_CONTAINER has been changed to bool (y/n), and its > > module option is no longer valid. So, remove the use of > > CONFIG_ACPI_CONTAINER_MODULE. > > > > Signed-off-by: Toshi Kani <toshi.kani@hp.com> > > I'm going to take it. Thanks! -Toshi > > Thanks, > Rafael > > > > --- > > include/linux/acpi.h | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > > index c6ccd9f..bcbdd74 100644 > > --- a/include/linux/acpi.h > > +++ b/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 > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Monday, February 11, 2013 03:33:20 PM Toshi Kani wrote: > config ACPI_CONTAINER has been changed to bool (y/n), and its > module option is no longer valid. So, remove the use of > CONFIG_ACPI_CONTAINER_MODULE. > > Signed-off-by: Toshi Kani <toshi.kani@hp.com> I'm going to take it. Thanks, Rafael > --- > include/linux/acpi.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index c6ccd9f..bcbdd74 100644 > --- a/include/linux/acpi.h > +++ b/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 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index c6ccd9f..bcbdd74 100644 --- a/include/linux/acpi.h +++ b/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
config ACPI_CONTAINER has been changed to bool (y/n), and its module option is no longer valid. So, remove the use of CONFIG_ACPI_CONTAINER_MODULE. Signed-off-by: Toshi Kani <toshi.kani@hp.com> --- include/linux/acpi.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html