Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[mirror_ubuntu-artful-kernel.git] / sound / oss / dmasound / Kconfig

diff --git a/sound/oss/dmasound/Kconfig b/sound/oss/dmasound/Kconfig
index cb845580fe031ee54efcf5f19acac2a8fa025173..f456574a964dc22639eb3dcf1a426c85288a1480 100644 (file)
--- a/sound/oss/dmasound/Kconfig
+++ b/sound/oss/dmasound/Kconfig
@@ -12,23 +12,9 @@ config DMASOUND_ATARI
          want). If you want to compile it as a module, say M here and read
          <file:Documentation/kbuild/modules.txt>.
 
          want). If you want to compile it as a module, say M here and read
          <file:Documentation/kbuild/modules.txt>.
 

-config DMASOUND_PMAC
-       tristate "PowerMac DMA sound support"
-       depends on PPC32 && PPC_PMAC && SOUND && I2C
-       select DMASOUND
-       help
-         If you want to use the internal audio of your PowerMac in Linux,
-         answer Y to this question. This will provide a Sun-like /dev/audio,
-         compatible with the Linux/i386 sound system. Otherwise, say N.
-
-         This driver is also available as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you
-         want). If you want to compile it as a module, say M here and read
-         <file:Documentation/kbuild/modules.txt>.
-

 config DMASOUND_PAULA
        tristate "Amiga DMA sound support"
 config DMASOUND_PAULA
        tristate "Amiga DMA sound support"

-       depends on (AMIGA || APUS) && SOUND
+       depends on AMIGA && SOUND

        select DMASOUND
        help
          If you want to use the internal audio of your Amiga in Linux, answer
        select DMASOUND
        help
          If you want to use the internal audio of your Amiga in Linux, answer


@@ -56,3 +42,4 @@ config DMASOUND_Q40
 
 config DMASOUND
        tristate
 
 config DMASOUND
        tristate

+       select SOUND_OSS_CORE