diff options
author | Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> | 2009-01-06 00:57:24 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:25:14 -0500 |
commit | d2b4397bf87cf6547ca9fa75b6b84eada96c0848 (patch) | |
tree | 60473f17313eadb8de7cf04b14e279e7d74a9d51 | |
parent | c6ac71a14aec8278507a71d9d9f496dc9adad010 (diff) |
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>
-rw-r--r-- | arch/powerpc/platforms/iseries/Kconfig | 5 | ||||
-rw-r--r-- | drivers/char/Kconfig | 1 | ||||
-rw-r--r-- | drivers/scsi/Kconfig | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig index ed3753d8c109..7ddd0a2c8027 100644 --- a/arch/powerpc/platforms/iseries/Kconfig +++ b/arch/powerpc/platforms/iseries/Kconfig | |||
@@ -10,18 +10,21 @@ menu "iSeries device drivers" | |||
10 | config VIODASD | 10 | config VIODASD |
11 | tristate "iSeries Virtual I/O disk support" | 11 | tristate "iSeries Virtual I/O disk support" |
12 | depends on BLOCK | 12 | depends on BLOCK |
13 | select VIOPATH | ||
13 | help | 14 | help |
14 | If you are running on an iSeries system and you want to use | 15 | If you are running on an iSeries system and you want to use |
15 | virtual disks created and managed by OS/400, say Y. | 16 | virtual disks created and managed by OS/400, say Y. |
16 | 17 | ||
17 | config VIOCD | 18 | config VIOCD |
18 | tristate "iSeries Virtual I/O CD support" | 19 | tristate "iSeries Virtual I/O CD support" |
20 | select VIOPATH | ||
19 | help | 21 | help |
20 | If you are running Linux on an IBM iSeries system and you want to | 22 | If you are running Linux on an IBM iSeries system and you want to |
21 | read a CD drive owned by OS/400, say Y here. | 23 | read a CD drive owned by OS/400, say Y here. |
22 | 24 | ||
23 | config VIOTAPE | 25 | config VIOTAPE |
24 | tristate "iSeries Virtual Tape Support" | 26 | tristate "iSeries Virtual Tape Support" |
27 | select VIOPATH | ||
25 | help | 28 | help |
26 | If you are running Linux on an iSeries system and you want Linux | 29 | If you are running Linux on an iSeries system and you want Linux |
27 | to read and/or write a tape drive owned by OS/400, say Y here. | 30 | to read and/or write a tape drive owned by OS/400, say Y here. |
@@ -30,5 +33,3 @@ endmenu | |||
30 | 33 | ||
31 | config VIOPATH | 34 | config VIOPATH |
32 | bool | 35 | bool |
33 | depends on VIODASD || VIOCD || VIOTAPE || ISERIES_VETH | ||
34 | default y | ||
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 35914b6e1d2a..f5be8081cd81 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -616,6 +616,7 @@ config HVC_ISERIES | |||
616 | default y | 616 | default y |
617 | select HVC_DRIVER | 617 | select HVC_DRIVER |
618 | select HVC_IRQ | 618 | select HVC_IRQ |
619 | select VIOPATH | ||
619 | help | 620 | help |
620 | iSeries machines support a hypervisor virtual console. | 621 | iSeries machines support a hypervisor virtual console. |
621 | 622 | ||
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index b7322976d2b7..256c7bec7bd7 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -884,6 +884,7 @@ config SCSI_IBMVSCSI | |||
884 | tristate "IBM Virtual SCSI support" | 884 | tristate "IBM Virtual SCSI support" |
885 | depends on PPC_PSERIES || PPC_ISERIES | 885 | depends on PPC_PSERIES || PPC_ISERIES |
886 | select SCSI_SRP_ATTRS | 886 | select SCSI_SRP_ATTRS |
887 | select VIOPATH if PPC_ISERIES | ||
887 | help | 888 | help |
888 | This is the IBM POWER Virtual SCSI Client | 889 | This is the IBM POWER Virtual SCSI Client |
889 | 890 | ||