diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-30 04:28:20 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-30 16:04:36 +0200 |
commit | a1ec657213b4abb00e59385171554a3e11eec27c (patch) | |
tree | f0401522eb90acee967c21660a4e3144b8276741 /drivers/acpi/internal.h | |
parent | d34afa9de4447367b734ec407e5a9e10617d6ec3 (diff) |
ACPI / scan: always register container scan handler
Prevent platform devices from being created for ACPI containers
if CONFIG_ACPI_CONTAINER is unset by compiling out the container
scan handler's callbacks only in that case and still compiling
its device ID list in and registering the scan handler in either
case.
This change is based on a prototype from Zhang Rui.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers/acpi/internal.h')
-rw-r--r-- | drivers/acpi/internal.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 5c16cb6bc76d..cc93efd22a24 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -32,11 +32,7 @@ void acpi_processor_init(void); void acpi_platform_init(void); void acpi_pnp_init(void); int acpi_sysfs_init(void); -#ifdef CONFIG_ACPI_CONTAINER void acpi_container_init(void); -#else -static inline void acpi_container_init(void) {} -#endif #ifdef CONFIG_ACPI_DOCK void register_dock_dependent_device(struct acpi_device *adev, acpi_handle dshandle); |