summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-15 08:05:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-15 08:05:37 -0700
commitc6538499814d8112c5d4d08570a7cf0758e5f8f5 (patch)
tree3c3574d8aea838d91372765847577772092f09bc /arch
parent662f11cf2aaedd3d5fe6afbec78ba3288fd0c4ca (diff)
parentcd17cbfda004fe5f406c01b318c6378d9895896f (diff)
downloadlinux-c6538499814d8112c5d4d08570a7cf0758e5f8f5.tar.bz2
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/Kconfig1
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