powerpc/kconfig: Kill PPC_MULTIPLATFORM

[deliverable/linux.git] / arch / powerpc / platforms / iseries / Kconfig

diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index 45ffd8e542f4b79757dba792031cbe7d8295a704..647e87787437e43d058278a078ac52372410b2fb 100644 (file)
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -1,6 +1,6 @@
 config PPC_ISERIES
        bool "IBM Legacy iSeries"
-       depends on PPC_MULTIPLATFORM && PPC64
+       depends on PPC64 && PPC_BOOK3S
        select PPC_INDIRECT_IO
        select PPC_PCI_CHOICE if EMBEDDED
 
@@ -9,18 +9,22 @@ menu "iSeries device drivers"
 
 config VIODASD
        tristate "iSeries Virtual I/O disk support"
+       depends on BLOCK
+       select VIOPATH
        help
          If you are running on an iSeries system and you want to use
          virtual disks created and managed by OS/400, say Y.
 
 config VIOCD
        tristate "iSeries Virtual I/O CD support"
+       select VIOPATH
        help
          If you are running Linux on an IBM iSeries system and you want to
          read a CD drive owned by OS/400, say Y here.
 
 config VIOTAPE
        tristate "iSeries Virtual Tape Support"
+       select VIOPATH
        help
          If you are running Linux on an iSeries system and you want Linux
          to read and/or write a tape drive owned by OS/400, say Y here.
@@ -29,5 +33,3 @@ endmenu
 
 config VIOPATH
        bool
-       depends on VIODASD || VIOCD || VIOTAPE || ISERIES_VETH
-       default y