Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754078AbYHMV7a (ORCPT ); Wed, 13 Aug 2008 17:59:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752684AbYHMV7V (ORCPT ); Wed, 13 Aug 2008 17:59:21 -0400 Received: from smtp6.pp.htv.fi ([213.243.153.40]:51360 "EHLO smtp6.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752647AbYHMV7V (ORCPT ); Wed, 13 Aug 2008 17:59:21 -0400 Date: Thu, 14 Aug 2008 00:57:28 +0300 From: Adrian Bunk To: Dave Airlie Cc: Randy Dunlap , lkml , akpm Subject: [RFC: -next patch] don't allow FB_SIS=m, DRM_SIS=y Message-ID: <20080813215728.GD7071@cs181140183.pp.htv.fi> References: <20080807083228.0fc40405.randy.dunlap@oracle.com> <20080807175552.67d5385d.randy.dunlap@oracle.com> <20080812125906.GC13910@cs181140183.pp.htv.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1625 Lines: 52 On Tue, Aug 12, 2008 at 10:37:00PM +0100, Dave Airlie wrote: > > > > > > > Maybe the other way around, I don't want DRM_SIS influencing whether > > > FB_SIS is on or off, if the user wants sisfb on, then when they select it, > > > DRM_SIS should be built in the same way. But if sisfb isn't selected by > > > the user, then selecting DRM_SIS shouldn't enable it. > > > > If FB_SIS=m, should DRM_SIS=y be allowed or should in this case DRM_SIS > > be restricted to n/m? > > Probably not. if FB_SIS is selected at all, DRM_SIS should match it, if > FB_SIS isn't selected, DRM_SIS should not select it. I assume FB_SIS=y, DRM_SIS=m should still be possible? If this assumption is correct the fix is below. > Dave. cu Adrian <-- snip --> FB_SIS=m, DRM_SIS=y is not a legal configuration. Reported-by: Randy Dunlap Signed-off-by: Adrian Bunk --- c303119b9561e13be97f3d4b0d7eaa6930fc21d8 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 610d6fd..bf9003e 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -87,6 +87,7 @@ config DRM_MGA config DRM_SIS tristate "SiS video cards" depends on DRM && AGP + depends on FB_SIS || FB_SIS=n help Choose this option if you have a SiS 630 or compatible video chipset. If M is selected the module will be called sis. AGP -- 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/