Commit a91ed42d authored by Ben Hutchings's avatar Ben Hutchings Committed by Ben Skeggs

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: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 5effecd4
...@@ -11,8 +11,9 @@ config DRM_NOUVEAU ...@@ -11,8 +11,9 @@ config DRM_NOUVEAU
select FRAMEBUFFER_CONSOLE if !EXPERT select FRAMEBUFFER_CONSOLE if !EXPERT
select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT
select ACPI_WMI if ACPI select X86_PLATFORM_DEVICES if ACPI && X86
select MXM_WMI if ACPI select ACPI_WMI if ACPI && X86
select MXM_WMI if ACPI && X86
select POWER_SUPPLY select POWER_SUPPLY
help help
Choose this option for open-source nVidia support. Choose this option for open-source nVidia support.
......
...@@ -238,7 +238,9 @@ nouveau-y += nouveau_mem.o ...@@ -238,7 +238,9 @@ nouveau-y += nouveau_mem.o
# other random bits # other random bits
nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
ifdef CONFIG_X86
nouveau-$(CONFIG_ACPI) += nouveau_acpi.o nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
endif
nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
...@@ -172,7 +172,7 @@ nouveau_bios_shadow_prom(struct nouveau_bios *bios) ...@@ -172,7 +172,7 @@ nouveau_bios_shadow_prom(struct nouveau_bios *bios)
nv_wr32(bios, pcireg, access); 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); int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
bool nouveau_acpi_rom_supported(struct pci_dev *pdev); bool nouveau_acpi_rom_supported(struct pci_dev *pdev);
#else #else
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#define ROM_BIOS_PAGE 4096 #define ROM_BIOS_PAGE 4096
#if defined(CONFIG_ACPI) #if defined(CONFIG_ACPI) && defined(CONFIG_X86)
bool nouveau_is_optimus(void); bool nouveau_is_optimus(void);
bool nouveau_is_v1_dsm(void); bool nouveau_is_v1_dsm(void);
void nouveau_register_dsm_handler(void); void nouveau_register_dsm_handler(void);
......
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