diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 04:58:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 04:58:01 -0400 |
| commit | 4894e4aca82aca927d0404ce61f021f790de4b1e (patch) | |
| tree | bbe0d083829f5858295298f188d885367cf4b1f6 /arch/powerpc/platforms/iseries/Kconfig | |
| parent | 05e882f890038c702a4f15d385135d03cf74ad48 (diff) | |
| parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) | |
Merge commit 'v2.6.30' into next
Diffstat (limited to 'arch/powerpc/platforms/iseries/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/iseries/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig index 647e87787437..47a20cfb4486 100644 --- a/arch/powerpc/platforms/iseries/Kconfig +++ b/arch/powerpc/platforms/iseries/Kconfig | |||
| @@ -17,6 +17,7 @@ config VIODASD | |||
| 17 | 17 | ||
| 18 | config VIOCD | 18 | config VIOCD |
| 19 | tristate "iSeries Virtual I/O CD support" | 19 | tristate "iSeries Virtual I/O CD support" |
| 20 | depends on BLOCK | ||
| 20 | select VIOPATH | 21 | select VIOPATH |
| 21 | help | 22 | help |
| 22 | If you are running Linux on an IBM iSeries system and you want to | 23 | If you are running Linux on an IBM iSeries system and you want to |