diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-05 03:02:25 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-15 01:33:11 +0200 |
| commit | e6c215f15a1cbf4cdd6996d95fba0c0d6c0f3ccc (patch) | |
| tree | 831b6877a6070fb2e52aa8fe8bab86be1f9de5c9 /include/acpi | |
| parent | a30c4c5ee85680bb66ed8a6c0b0bf4921125c378 (diff) | |
| download | linux-e6c215f15a1cbf4cdd6996d95fba0c0d6c0f3ccc.tar.gz linux-e6c215f15a1cbf4cdd6996d95fba0c0d6c0f3ccc.tar.bz2 linux-e6c215f15a1cbf4cdd6996d95fba0c0d6c0f3ccc.zip | |
ACPI / dock: Do not check CONFIG_ACPI_DOCK_MODULE
Since commit 94add0f (ACPI / dock: Initialize ACPI dock subsystem
upfront) the ACPI dock driver cannot be a module, so
CONFIG_ACPI_DOCK_MODULE is never set. For this reason, simplify
the preprocessor conditional in include/acpi/acpi_drivers.h
referring to that sybbol unnecessarily.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index b420939f5eb5..0cf85786ed21 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -117,7 +117,7 @@ struct acpi_dock_ops { acpi_notify_handler uevent; }; -#if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE) +#ifdef CONFIG_ACPI_DOCK extern int is_dock_device(acpi_handle handle); extern int register_dock_notifier(struct notifier_block *nb); extern void unregister_dock_notifier(struct notifier_block *nb); @@ -150,6 +150,6 @@ static inline int register_hotplug_dock_device(acpi_handle handle, static inline void unregister_hotplug_dock_device(acpi_handle handle) { } -#endif +#endif /* CONFIG_ACPI_DOCK */ #endif /*__ACPI_DRIVERS_H__*/ |