From patchwork Fri Sep 10 03:53:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Turmel X-Patchwork-Id: 168291 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8A6bo6O010452 for ; Fri, 10 Sep 2010 06:38:26 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3DC149EFD8 for ; Thu, 9 Sep 2010 23:37:50 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 10 Sep 2010 06:38:26 +0000 (UTC) X-Greylist: delayed 911 seconds by postgrey-1.31 at gabe; Thu, 09 Sep 2010 21:09:09 PDT Received: from atl.turmel.org (atl.turmel.org [74.117.157.138]) by gabe.freedesktop.org (Postfix) with ESMTP id 9DFCA9E790 for ; Thu, 9 Sep 2010 21:09:09 -0700 (PDT) Received: from [65.7.130.205] (helo=[192.168.2.180]) by atl.turmel.org with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1OtugF-0004B7-PE; Thu, 09 Sep 2010 23:53:39 -0400 Message-ID: <4C89ABC3.8080701@turmel.org> Date: Thu, 09 Sep 2010 23:53:39 -0400 From: Phil Turmel User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.8) Gecko/20100908 Lightning/1.0b2 Thunderbird/3.1.2 MIME-Version: 1.0 To: linux-kernel@vger.kernel.org Subject: [PATCH] nouveau build regression, undefined reference to `acpi_video_get_edid' X-Enigmail-Version: 1.1.2 X-Mailman-Approved-At: Thu, 09 Sep 2010 23:36:53 -0700 Cc: dri-devel@lists.freedesktop.org, Ben Skeggs , Dave Airlie , Matthew Garrett X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile index e9b06e4..4e295b5 100644 --- a/drivers/gpu/drm/nouveau/Makefile +++ b/drivers/gpu/drm/nouveau/Makefile @@ -28,6 +28,6 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o -nouveau-$(CONFIG_ACPI) += nouveau_acpi.o +nouveau-$(CONFIG_ACPI_VIDEO) += nouveau_acpi.o obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index b1be617..bd995b4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -842,7 +842,7 @@ extern int nouveau_dma_wait(struct nouveau_channel *, int slots, int size); /* nouveau_acpi.c */ #define ROM_BIOS_PAGE 4096 -#if defined(CONFIG_ACPI) +#if defined(CONFIG_ACPI_VIDEO) void nouveau_register_dsm_handler(void); void nouveau_unregister_dsm_handler(void); int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);