summaryrefslogtreecommitdiff
path: root/include/linux/apple-gmux.h
diff options
context:
space:
mode:
authorLukas Wunner <lukas@wunner.de>2016-02-10 16:17:41 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-02-11 11:23:59 +0300
commitb7172119714781d15128cd1ae029bd028b0bf37a (patch)
treedfd7d402b2b587d8ed485ad04dec02b143e91aa9 /include/linux/apple-gmux.h
parent3c5b267314ff00b4a9536769cc1aafc71384e559 (diff)
downloadlinux-b7172119714781d15128cd1ae029bd028b0bf37a.tar.xz
apple-gmux: Fix build breakage if !CONFIG_ACPI
The DRM drivers i915, nouveau and radeon may be compiled with CONFIG_ACPI not set, in which case acpi_dev_present() is undefined. Add a no-op stub for apple_gmux_present() which is used if CONFIG_APPLE_GMUX is not enabled to avoid build breakage. (CONFIG_APPLE_GMUX depends on CONFIG_ACPI.) Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Lukas Wunner <lukas@wunner.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20160210131741.GA15492@wunner.de
Diffstat (limited to 'include/linux/apple-gmux.h')
-rw-r--r--include/linux/apple-gmux.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/include/linux/apple-gmux.h b/include/linux/apple-gmux.h
index feebc2840462..b2d32e01dfe4 100644
--- a/include/linux/apple-gmux.h
+++ b/include/linux/apple-gmux.h
@@ -22,6 +22,8 @@
#define GMUX_ACPI_HID "APP000B"
+#if IS_ENABLED(CONFIG_APPLE_GMUX)
+
/**
* apple_gmux_present() - detect if gmux is built into the machine
*
@@ -33,7 +35,16 @@
*/
static inline bool apple_gmux_present(void)
{
- return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
+ return acpi_dev_present(GMUX_ACPI_HID);
}
+#else /* !CONFIG_APPLE_GMUX */
+
+static inline bool apple_gmux_present(void)
+{
+ return false;
+}
+
+#endif /* !CONFIG_APPLE_GMUX */
+
#endif /* LINUX_APPLE_GMUX_H */