diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 11:05:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 11:05:37 -0400 |
| commit | c6538499814d8112c5d4d08570a7cf0758e5f8f5 (patch) | |
| tree | 3c3574d8aea838d91372765847577772092f09bc /arch | |
| parent | 662f11cf2aaedd3d5fe6afbec78ba3288fd0c4ca (diff) | |
| parent | cd17cbfda004fe5f406c01b318c6378d9895896f (diff) | |
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 | |||
| 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 |