diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-05-23 19:42:19 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-23 19:42:19 -0400 |
| commit | ee0736627d3347be0be2769fa7b26431f9726c9d (patch) | |
| tree | 203e2204daaec4cf005463fdf2c7bf380d6eef36 /arch/powerpc/platforms/iseries/Kconfig | |
| parent | cf9972a921470b0a2da7906104bcd540b20e33bf (diff) | |
| parent | 0af48f42df15b97080b450d24219dd95db7b929a (diff) | |
Merge branch 'x86/urgent' into x86/setup
Resolved conflicts:
arch/x86/boot/memory.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
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 |