summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_acpi.h
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2013-02-20 02:57:32 +0000
committerBen Skeggs <bskeggs@redhat.com>2013-02-20 16:05:16 +1000
commita91ed42de25e7e81159c0dd59faf8cac9dfa1d32 (patch)
treecdc591f8dd70b3c83497fcfd06fa836cfaf944b3 /drivers/gpu/drm/nouveau/nouveau_acpi.h
parent5effecd4f8ff0200c4224060275a6c4ecbeed3eb (diff)
downloadop-kernel-dev-a91ed42de25e7e81159c0dd59faf8cac9dfa1d32.zip
op-kernel-dev-a91ed42de25e7e81159c0dd59faf8cac9dfa1d32.tar.gz
nouveau: ACPI support depends on X86 and X86_PLATFORM_DEVICES
If I build nouveau on ia64, Kconfig warns: warning: (DRM_NOUVEAU) selects ACPI_WMI which has unmet direct dependencies (X86 && X86_PLATFORM_DEVICES && ACPI) warning: (DRM_NOUVEAU) selects MXM_WMI which has unmet direct dependencies (X86 && X86_PLATFORM_DEVICES && ACPI_WMI) Make all the ACPI support depend on X86 and select X86_PLATFORM_DEVICES. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_acpi.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_acpi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.h b/drivers/gpu/drm/nouveau/nouveau_acpi.h
index d0da230..74acf0f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.h
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.h
@@ -3,7 +3,7 @@
#define ROM_BIOS_PAGE 4096
-#if defined(CONFIG_ACPI)
+#if defined(CONFIG_ACPI) && defined(CONFIG_X86)
bool nouveau_is_optimus(void);
bool nouveau_is_v1_dsm(void);
void nouveau_register_dsm_handler(void);
OpenPOWER on IntegriCloud