diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-07-16 02:40:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:42 -0400 |
commit | f057eac0d7ad967138390a9dd7fd8267e1e39d19 (patch) | |
tree | 96e951adb2934ee4495edda09f94c67c02fcf5ab /sound/oss | |
parent | 693783817a79d8619335e2bf1a33de73cf189864 (diff) |
Introduce CONFIG_VIRT_TO_BUS
Make some offending drivers depend on it and set CONFIG_ARCH_NO_VIRT_TO_BUS
for ppc64 so that we don't build those drivers.
This gets PowerPC allmodconfig and allyesconfig much closer to building.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ftp.linux.org.uk>
Acked-by: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/oss')
-rw-r--r-- | sound/oss/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 4b30ae6d8ba5..314477909f82 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig | |||
@@ -348,7 +348,7 @@ config MSND_FIFOSIZE | |||
348 | 348 | ||
349 | config SOUND_VIA82CXXX | 349 | config SOUND_VIA82CXXX |
350 | tristate "VIA 82C686 Audio Codec" | 350 | tristate "VIA 82C686 Audio Codec" |
351 | depends on SOUND_PRIME && PCI && OSS_OBSOLETE | 351 | depends on SOUND_PRIME && PCI && OSS_OBSOLETE && VIRT_TO_BUS |
352 | help | 352 | help |
353 | Say Y here to include support for the audio codec found on VIA | 353 | Say Y here to include support for the audio codec found on VIA |
354 | 82Cxxx-based chips. Typically these are built into a motherboard. | 354 | 82Cxxx-based chips. Typically these are built into a motherboard. |
@@ -368,7 +368,7 @@ config MIDI_VIA82CXXX | |||
368 | 368 | ||
369 | config SOUND_OSS | 369 | config SOUND_OSS |
370 | tristate "OSS sound modules" | 370 | tristate "OSS sound modules" |
371 | depends on SOUND_PRIME && ISA_DMA_API | 371 | depends on SOUND_PRIME && ISA_DMA_API && VIRT_TO_BUS |
372 | help | 372 | help |
373 | OSS is the Open Sound System suite of sound card drivers. They make | 373 | OSS is the Open Sound System suite of sound card drivers. They make |
374 | sound programming easier since they provide a common API. Say Y or | 374 | sound programming easier since they provide a common API. Say Y or |
@@ -417,6 +417,7 @@ config SOUND_CS4232 | |||
417 | config SOUND_SSCAPE | 417 | config SOUND_SSCAPE |
418 | tristate "Ensoniq SoundScape support" | 418 | tristate "Ensoniq SoundScape support" |
419 | depends on SOUND_OSS | 419 | depends on SOUND_OSS |
420 | depends on VIRT_TO_BUS | ||
420 | help | 421 | help |
421 | Answer Y if you have a sound card based on the Ensoniq SoundScape | 422 | Answer Y if you have a sound card based on the Ensoniq SoundScape |
422 | chipset. Such cards are being manufactured at least by Ensoniq, Spea | 423 | chipset. Such cards are being manufactured at least by Ensoniq, Spea |