diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 17:05:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 17:05:37 +0200 |
| commit | c6538499814d8112c5d4d08570a7cf0758e5f8f5 (patch) | |
| tree | 3c3574d8aea838d91372765847577772092f09bc /arch | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | Revert "mm: add /proc controls for pdflush threads" (diff) | |
| download | linux-c6538499814d8112c5d4d08570a7cf0758e5f8f5.tar.xz linux-c6538499814d8112c5d4d08570a7cf0758e5f8f5.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Revert "mm: add /proc controls for pdflush threads"
viocd: needs to depend on BLOCK
block: fix the bio_vec array index out-of-bounds test
Diffstat (limited to 'arch')
| -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 config VIOCD tristate "iSeries Virtual I/O CD support" + depends on BLOCK select VIOPATH help If you are running Linux on an IBM iSeries system and you want to |