diff options
author | Sudeep Holla <Sudeep.Holla@arm.com> | 2015-09-14 11:01:55 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-14 21:05:45 -0400 |
commit | bcb2b0b2bae2de744223c68521cd51c57feb486c (patch) | |
tree | 37193684c8ba60ca6f9212479844b7378b0f820b /include/acpi/button.h | |
parent | cf3a51059efd653aa38667db799e85d77231af9d (diff) |
ACPI: Eliminate CONFIG_.*{, _MODULE} #ifdef in favor of IS_ENABLED()
This commit removes all CONFIG_.*{,_MODULE} in ACPI code, replacing it
with IS_ENABLED().
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi/button.h')
-rw-r--r-- | include/acpi/button.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/button.h b/include/acpi/button.h index 97eea0e4c016..1cad8b2d460c 100644 --- a/include/acpi/button.h +++ b/include/acpi/button.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/notifier.h> | 4 | #include <linux/notifier.h> |
5 | 5 | ||
6 | #if defined(CONFIG_ACPI_BUTTON) || defined(CONFIG_ACPI_BUTTON_MODULE) | 6 | #if IS_ENABLED(CONFIG_ACPI_BUTTON) |
7 | extern int acpi_lid_notifier_register(struct notifier_block *nb); | 7 | extern int acpi_lid_notifier_register(struct notifier_block *nb); |
8 | extern int acpi_lid_notifier_unregister(struct notifier_block *nb); | 8 | extern int acpi_lid_notifier_unregister(struct notifier_block *nb); |
9 | extern int acpi_lid_open(void); | 9 | extern int acpi_lid_open(void); |
@@ -20,6 +20,6 @@ static inline int acpi_lid_open(void) | |||
20 | { | 20 | { |
21 | return 1; | 21 | return 1; |
22 | } | 22 | } |
23 | #endif /* defined(CONFIG_ACPI_BUTTON) || defined(CONFIG_ACPI_BUTTON_MODULE) */ | 23 | #endif /* IS_ENABLED(CONFIG_ACPI_BUTTON) */ |
24 | 24 | ||
25 | #endif /* ACPI_BUTTON_H */ | 25 | #endif /* ACPI_BUTTON_H */ |