Update nouveau/ia64 build fix to version sent upstream, and add Forwarded header
svn path=/dists/trunk/linux/; revision=19827
This commit is contained in:
parent
7ee04719e6
commit
72eeaf1a22
|
@ -1,26 +1,27 @@
|
|||
From 25d4d4e2d243622dfbd35a29e3fee9ce5f099fd2 Mon Sep 17 00:00:00 2001
|
||||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Mon, 6 Jun 2011 00:58:46 +0100
|
||||
Subject: [PATCH] nouveau: ACPI support is dependent on X86
|
||||
Date: Wed, 20 Feb 2013 02:38:08 +0000
|
||||
Subject: [PATCH] nouveau: ACPI support depends on X86 and X86_PLATFORM_DEVICES
|
||||
Forwarded: http://lists.freedesktop.org/archives/dri-devel/2013-February/035133.html
|
||||
|
||||
The ACPI support code probably wasn't very useful on ia64, and now
|
||||
depends on mxm-wmi which is definitely x86-only.
|
||||
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>
|
||||
---
|
||||
drivers/gpu/drm/nouveau/Kconfig | 4 ++--
|
||||
drivers/gpu/drm/nouveau/Makefile | 2 ++
|
||||
drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +-
|
||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/drivers/gpu/drm/nouveau/Kconfig
|
||||
+++ b/drivers/gpu/drm/nouveau/Kconfig
|
||||
@@ -11,8 +11,8 @@ config DRM_NOUVEAU
|
||||
@@ -11,8 +11,9 @@ config DRM_NOUVEAU
|
||||
select FRAMEBUFFER_CONSOLE if !EXPERT
|
||||
select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
|
||||
select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT
|
||||
- select ACPI_WMI if ACPI
|
||||
- select MXM_WMI if ACPI
|
||||
+ select X86_PLATFORM_DEVICES if ACPI && X86
|
||||
+ select ACPI_WMI if ACPI && X86
|
||||
+ select MXM_WMI if ACPI && X86
|
||||
select POWER_SUPPLY
|
||||
|
|
Loading…
Reference in New Issue