Commit b7172119 authored by Lukas Wunner's avatar Lukas Wunner Committed by Daniel Vetter

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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20160210131741.GA15492@wunner.de
parent 3c5b2673
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#define GMUX_ACPI_HID "APP000B" #define GMUX_ACPI_HID "APP000B"
#if IS_ENABLED(CONFIG_APPLE_GMUX)
/** /**
* apple_gmux_present() - detect if gmux is built into the machine * apple_gmux_present() - detect if gmux is built into the machine
* *
...@@ -33,7 +35,16 @@ ...@@ -33,7 +35,16 @@
*/ */
static inline bool apple_gmux_present(void) 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 */ #endif /* LINUX_APPLE_GMUX_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment