[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20080813215728.GD7071@cs181140183.pp.htv.fi>
Date: Thu, 14 Aug 2008 00:57:28 +0300
From: Adrian Bunk <bunk@...nel.org>
To: Dave Airlie <airlied@...ux.ie>
Cc: Randy Dunlap <randy.dunlap@...cle.com>,
lkml <linux-kernel@...r.kernel.org>,
akpm <akpm@...ux-foundation.org>
Subject: [RFC: -next patch] don't allow FB_SIS=m, DRM_SIS=y
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 <randy.dunlap@...cle.com>
Signed-off-by: Adrian Bunk <bunk@...nel.org>
---
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists