diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2013-02-20 02:57:32 +0000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-02-20 16:05:16 +1000 |
commit | a91ed42de25e7e81159c0dd59faf8cac9dfa1d32 (patch) | |
tree | cdc591f8dd70b3c83497fcfd06fa836cfaf944b3 /drivers/gpu/drm/nouveau/core/subdev/bios/base.c | |
parent | drm/nouveau/i2c: add support for ddc/aux, and dp link training on anx9805 (diff) | |
download | linux-dev-a91ed42de25e7e81159c0dd59faf8cac9dfa1d32.tar.xz linux-dev-a91ed42de25e7e81159c0dd59faf8cac9dfa1d32.zip |
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/core/subdev/bios/base.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/bios/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c index f621f69fa1a2..e816f06637a7 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c @@ -172,7 +172,7 @@ out: nv_wr32(bios, pcireg, access); } -#if defined(CONFIG_ACPI) +#if defined(CONFIG_ACPI) && defined(CONFIG_X86) int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len); bool nouveau_acpi_rom_supported(struct pci_dev *pdev); #else |