Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754201AbZFAOQ6 (ORCPT ); Mon, 1 Jun 2009 10:16:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751817AbZFAOQU (ORCPT ); Mon, 1 Jun 2009 10:16:20 -0400 Received: from ottmail.xandros.com ([142.46.212.35]:46025 "EHLO ottmail.xandros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751897AbZFAOQS (ORCPT ); Mon, 1 Jun 2009 10:16:18 -0400 Date: Mon, 1 Jun 2009 10:13:32 -0400 From: Woody Suwalski To: Len Brown cc: Randy Dunlap , "Rafael J. Wysocki" , Zorael , ACPI Devel Maling List , LKML Message-ID: <4A23E20C.3090807@xandros.com> In-Reply-To: References: References: <4A1464C9.9030603@xandros.com> References: <4A1475D5.6080602@oracle.com> References: Subject: Re: [i915] Kernel does not compile when set to use i915 kernel mode-setting per default (CONFIG_DRM_I915_KMS=y) x-scalix-Hops: 1 User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.21) Gecko/20090402 SeaMonkey/1.1.16 MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII"; format="flowed" Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2345 Lines: 70 Len Brown wrote: > From: Len Brown > Subject: [PATCH] ACPI, i915: build fix (v2) > > drivers/built-in.o: In function `intel_opregion_init': > (.text+0x9d540): undefined reference to `acpi_video_register' > > v2: move under DRM_I915 from DRM_I915_KMS > > Signed-off-by: Len Brown > Signed-off-by: Randy Dunlap > --- > as applied. > thanks, > -Len > > drivers/gpu/drm/Kconfig | 14 +++++++------- > 1 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index 4cd35d8..f5d46e7 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -67,12 +67,18 @@ config DRM_I830 > will load the correct one. > > config DRM_I915 > + tristate "i915 driver" > select FB_CFB_FILLRECT > select FB_CFB_COPYAREA > select FB_CFB_IMAGEBLIT > select FB > select FRAMEBUFFER_CONSOLE if !EMBEDDED > - tristate "i915 driver" > + # i915 depends on ACPI_VIDEO when ACPI is enabled > + # but for select to work, need to select ACPI_VIDEO's dependencies, ick > + select VIDEO_OUTPUT_CONTROL if ACPI > + select BACKLIGHT_CLASS_DEVICE if ACPI > + select INPUT if ACPI > + select ACPI_VIDEO if ACPI > help > Choose this option if you have a system that has Intel 830M, 845G, > 852GM, 855GM 865G or 915G integrated graphics. If M is selected, the > @@ -84,12 +90,6 @@ config DRM_I915 > config DRM_I915_KMS > bool "Enable modesetting on intel by default" > depends on DRM_I915 > - # i915 KMS depends on ACPI_VIDEO when ACPI is enabled > - # but for select to work, need to select ACPI_VIDEO's dependencies, ick > - select VIDEO_OUTPUT_CONTROL if ACPI > - select BACKLIGHT_CLASS_DEVICE if ACPI > - select INPUT if ACPI > - select ACPI_VIDEO if ACPI > help > Choose this option if you want kernel modesetting enabled by default, > and you have a new enough userspace to support this. Running old > Confirmed fixed - tried 2 builds based on -rc7, all OK. Thanks, Woody -- Woody Suwalski, Xandros, Ottawa, Canada, 1-613-842-3498 x414 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/