[PATCH] iseries: fix CONFIG_VIOCONS/CONFIG_VT dependency
Olof Johansson
olof at lixom.net
Wed May 16 05:03:44 EST 2007
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 at 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
More information about the Linuxppc-dev
mailing list