[XFS] Fix merge failures

[pandora-kernel.git] / arch / powerpc / platforms / iseries / Kconfig

diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index ea3e541..ed3753d 100644 (file)
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -7,17 +7,9 @@ config PPC_ISERIES
 menu "iSeries device drivers"
        depends on PPC_ISERIES
 
-config VIOCONS
-       bool "iSeries Virtual Console Support (Obsolete)"
-       depends on !HVC_ISERIES
-       default n
-       help
-         This is the old virtual console driver for legacy iSeries.
-         You should use the iSeries Hypervisor Virtual Console
-         support instead.
-
 config VIODASD
        tristate "iSeries Virtual I/O disk support"
+       depends on BLOCK
        help
          If you are running on an iSeries system and you want to use
          virtual disks created and managed by OS/400, say Y.
@@ -38,5 +30,5 @@ endmenu
 
 config VIOPATH
        bool
-       depends on VIOCONS || VIODASD || VIOCD || VIOTAPE || ISERIES_VETH
+       depends on VIODASD || VIOCD || VIOTAPE || ISERIES_VETH
        default y