summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2009-09-15 16:57:24 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-17 14:48:23 -0700
commit1a133e0c9dabda23e6693cabfdc1d5106dca5fc2 (patch)
tree04e0f95f130b65204c963a8f50c1c76d9cc3f04a
parentd660467c3ff2a0b7413e1b7a51452b34ffb49e5f (diff)
downloadop-kernel-dev-1a133e0c9dabda23e6693cabfdc1d5106dca5fc2.zip
op-kernel-dev-1a133e0c9dabda23e6693cabfdc1d5106dca5fc2.tar.gz
ACPI: make ACPI button funcs no-ops if not built in
Yakui pointed out that we don't properly no-op the ACPI button routines if the button driver isn't built in. This will cause problems if ACPI is disabled, so provide stub functions in that case. Reported-by: ykzhao <yakui.zhao@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r--include/acpi/button.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/include/acpi/button.h b/include/acpi/button.h
index bb643a7..97eea0e 100644
--- a/include/acpi/button.h
+++ b/include/acpi/button.h
@@ -3,8 +3,23 @@
#include <linux/notifier.h>
+#if defined(CONFIG_ACPI_BUTTON) || defined(CONFIG_ACPI_BUTTON_MODULE)
extern int acpi_lid_notifier_register(struct notifier_block *nb);
extern int acpi_lid_notifier_unregister(struct notifier_block *nb);
extern int acpi_lid_open(void);
+#else
+static inline int acpi_lid_notifier_register(struct notifier_block *nb)
+{
+ return 0;
+}
+static inline int acpi_lid_notifier_unregister(struct notifier_block *nb)
+{
+ return 0;
+}
+static inline int acpi_lid_open(void)
+{
+ return 1;
+}
+#endif /* defined(CONFIG_ACPI_BUTTON) || defined(CONFIG_ACPI_BUTTON_MODULE) */
#endif /* ACPI_BUTTON_H */
OpenPOWER on IntegriCloud