[PATCH] iseries: fix CONFIG_VIOCONS/CONFIG_VT dependency

[PATCH] iseries: fix CONFIG_VIOCONS/CONFIG_VT dependency

[Olof Johansson]

VT already depends on !VIOCONS, but there's no restriction in the other
direction. This makes an allyesconfig not build.

Switch to a Kconfig dependency instead of a compile-time error.


Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index 46c3a8e..e48f018 100644
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -8,6 +8,7 @@ menu "iSeries device drivers"
 
 config VIOCONS
 	tristate "iSeries Virtual Console Support (Obsolete)"
+	depends on !VT
 	help
 	  This is the old virtual console driver for legacy iSeries.
 	  You should use the iSeries Hypervisor Virtual Console
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 8de6b95..c2e7a93 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -49,10 +49,6 @@
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/hv_call.h>
 
-#ifdef CONFIG_VT
-#error You must turn off CONFIG_VT to use CONFIG_VIOCONS
-#endif
-
 #define VIOTTY_MAGIC (0x0DCB)
 #define VTTY_PORTS 10
 

Re: [PATCH] iseries: fix CONFIG_VIOCONS/CONFIG_VT dependency

[Michael Ellerman]

[-- Attachment #1: Type: text/plain, Size: 1176 bytes --]

On Tue, 2007-05-15 at 14:03 -0500, Olof Johansson wrote:
> VT already depends on !VIOCONS, but there's no restriction in the other
> direction. This makes an allyesconfig not build.
> 
> Switch to a Kconfig dependency instead of a compile-time error.
> 
> 
> Signed-off-by: Olof Johansson <olof@lixom.net>
> 
> diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
> index 46c3a8e..e48f018 100644
> --- a/arch/powerpc/platforms/iseries/Kconfig
> +++ b/arch/powerpc/platforms/iseries/Kconfig
> @@ -8,6 +8,7 @@ menu "iSeries device drivers"
>  
>  config VIOCONS
>  	tristate "iSeries Virtual Console Support (Obsolete)"
> +	depends on !VT
>  	help

This context doesn't match linus' or the powerpc tree, I see:

config VIOCONS
        bool "iSeries Virtual Console Support (Obsolete)"
        depends on !HVC_ISERIES
        default n
        help

cheers


-- 
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] iseries: fix CONFIG_VIOCONS/CONFIG_VT dependency

[Olof Johansson]

On Wed, May 16, 2007 at 01:41:59PM +1000, Michael Ellerman wrote:
> On Tue, 2007-05-15 at 14:03 -0500, Olof Johansson wrote:
> > VT already depends on !VIOCONS, but there's no restriction in the other
> > direction. This makes an allyesconfig not build.
> > 
> > Switch to a Kconfig dependency instead of a compile-time error.
> > 
> > 
> > Signed-off-by: Olof Johansson <olof@lixom.net>
> > 
> > diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
> > index 46c3a8e..e48f018 100644
> > --- a/arch/powerpc/platforms/iseries/Kconfig
> > +++ b/arch/powerpc/platforms/iseries/Kconfig
> > @@ -8,6 +8,7 @@ menu "iSeries device drivers"
> >  
> >  config VIOCONS
> >  	tristate "iSeries Virtual Console Support (Obsolete)"
> > +	depends on !VT
> >  	help
> 
> This context doesn't match linus' or the powerpc tree, I see:
> 
> config VIOCONS
>         bool "iSeries Virtual Console Support (Obsolete)"
>         depends on !HVC_ISERIES
>         default n
>         help

Boggle, I thought I did the checks in paulus' tree. It must have been
in my 2.6.21 one instead. :(

So nevermind, the above is obviously enough.


-Olof