powerpc: Fix iseries drivers build failure without CONFIG_VIOPATH

iSeries dependent drivers fail to build, when CONFIG_VIOPATH is disabled.

Fix the problem by making those drivers select it.

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index ed3753d8c1090b5108fd792844b0e91835135be0..7ddd0a2c80276e3538088dc6e290a881285e2788 100644 (file)
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -10,18 +10,21 @@ 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.
@@ -30,5 +33,3 @@ endmenu
 
 config VIOPATH
        bool
-       depends on VIODASD || VIOCD || VIOTAPE || ISERIES_VETH
-       default y

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 35914b6e1d2aee32ddf29dc63b14a6d09e8298e8..f5be8081cd8187e87a5e3d85254abefc2be1e85b 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -616,6 +616,7 @@ config HVC_ISERIES
        default y
        select HVC_DRIVER
        select HVC_IRQ
+       select VIOPATH
        help
          iSeries machines support a hypervisor virtual console.
 

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index b7322976d2b7c7e3c131deecd577181209804d83..256c7bec7bd722d188830c6003d3dd83c593bab8 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -884,6 +884,7 @@ config SCSI_IBMVSCSI
        tristate "IBM Virtual SCSI support"
        depends on PPC_PSERIES || PPC_ISERIES
        select SCSI_SRP_ATTRS
+       select VIOPATH if PPC_ISERIES
        help
          This is the IBM POWER Virtual SCSI Client