diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:34 -0400 |
| commit | 44347d947f628060b92449702071bfe1d31dfb75 (patch) | |
| tree | c6ed74610d5b3295df4296659f80f5feb94b28cc /drivers/macintosh/Kconfig | |
| parent | d94fc523f3c35bd8013f04827e94756cbc0212f4 (diff) | |
| parent | 413f81eba35d6ede9289b0c8a920c013a84fac71 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/macintosh/Kconfig')
| -rw-r--r-- | drivers/macintosh/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index 173cf55c64d0..3d906833948d 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig | |||
| @@ -123,7 +123,7 @@ config PMAC_APM_EMU | |||
| 123 | 123 | ||
| 124 | config PMAC_MEDIABAY | 124 | config PMAC_MEDIABAY |
| 125 | bool "Support PowerBook hotswap media bay" | 125 | bool "Support PowerBook hotswap media bay" |
| 126 | depends on PPC_PMAC && PPC32 | 126 | depends on PPC_PMAC && PPC32 && BLOCK |
| 127 | help | 127 | help |
| 128 | This option adds support for older PowerBook's hotswap media bay | 128 | This option adds support for older PowerBook's hotswap media bay |
| 129 | that can contains batteries, floppy drives, or IDE devices. PCI | 129 | that can contains batteries, floppy drives, or IDE devices. PCI |