Skip to contentSkip to conversation

iseries: fix CONFIG_VIOCONS/CONFIG_VT dependency

PATCH In review Olof Johansson 2 participants 3 messages May 15, 2007 – May 16, 2007

Subsystems (2)
PowerPC Char and misc drivers
lore
Share & tools
lore

Olof Johansson

author
#0 lore raw

PATCH 1/1 iseries: fix CONFIG_VIOCONS/CONFIG_VT dependency

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 <[email protected]>
arch/powerpc/platforms/iseries/Kconfig +1 -0
index 46c3a8e..e48f018 100644
@@ -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
drivers/char/viocons.c +0 -4
index 8de6b95..c2e7a93 100644
@@ -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
#1 lore raw
Quoted 13 lines · 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 <[email protected]>
arch/powerpc/platforms/iseries/Kconfig +0 -0
index 46c3a8e..e48f018 100644

arch/powerpc/platforms/iseries/Kconfig menu "iSeries device drivers" · line 12

Quoted 5 lines
arch/powerpc/platforms/iseries/Kconfig +1 -0
@@ -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

Signature · 8 lines
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
author
#2 lore raw
Quoted 22 lines · Michael Ellerman
Quoted 13 lines · 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 <[email protected]>
arch/powerpc/platforms/iseries/Kconfig +0 -0
index 46c3a8e..e48f018 100644

arch/powerpc/platforms/iseries/Kconfig menu "iSeries device drivers" · line 12

Quoted 5 lines
arch/powerpc/platforms/iseries/Kconfig +1 -0
@@ -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:

Quoted 5 lines

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