diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-30 14:34:05 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-30 16:04:36 +0200 |
| commit | d6ddaaac8f5c37ad84db3e6e019981f392389cf0 (patch) | |
| tree | 1b5cb6bd0e4e8ba9b02b81174fb5f3464aabff59 /drivers/acpi/internal.h | |
| parent | cccd420859a419756bc4ed25d52989a47d702561 (diff) | |
ACPI / scan: always register ACPI LPSS scan handler
Prevent platform devices from being created for ACPI LPSS devices
if CONFIG_X86_INTEL_LPSS is unset by compiling out the LPSS 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 5ad27bf8e4bd..7de5b603f272 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -65,11 +65,7 @@ int acpi_debugfs_init(void); #else static inline void acpi_debugfs_init(void) { return; } #endif -#ifdef CONFIG_X86_INTEL_LPSS void acpi_lpss_init(void); -#else -static inline void acpi_lpss_init(void) {} -#endif acpi_status acpi_hotplug_schedule(struct acpi_device *adev, u32 src); bool acpi_queue_hotplug_work(struct work_struct *work); |