diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-24 19:48:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-24 19:48:28 -0400 |
| commit | e6ff4c75f9095f61b3a66c2a78e47b62864022dd (patch) | |
| tree | 425ea9463cbec0b1975b8a33d9a56817143055d0 /sound/oss/Kconfig | |
| parent | ee9c799c231324de681eb21e06d8bf4842768b75 (diff) | |
| parent | 0e255f1c0c9add2f0c920240ac4cadc28ae274c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next because some upcoming net-next changes
build on top of bug fixes that went into net.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/oss/Kconfig')
| -rw-r--r-- | sound/oss/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 51c4ba95a32d..1a9640254433 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig | |||
| @@ -250,7 +250,7 @@ config MSND_FIFOSIZE | |||
| 250 | menuconfig SOUND_OSS | 250 | menuconfig SOUND_OSS |
| 251 | tristate "OSS sound modules" | 251 | tristate "OSS sound modules" |
| 252 | depends on ISA_DMA_API && VIRT_TO_BUS | 252 | depends on ISA_DMA_API && VIRT_TO_BUS |
| 253 | depends on !ISA_DMA_SUPPORT_BROKEN | 253 | depends on !GENERIC_ISA_DMA_SUPPORT_BROKEN |
| 254 | help | 254 | help |
| 255 | OSS is the Open Sound System suite of sound card drivers. They make | 255 | OSS is the Open Sound System suite of sound card drivers. They make |
| 256 | sound programming easier since they provide a common API. Say Y or | 256 | sound programming easier since they provide a common API. Say Y or |