summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-20 12:59:45 (GMT)
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-20 12:59:45 (GMT)
commitd59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch)
tree351a40b72514d620e5bebea2de38c26f23277ffc /sound
parent28df955a2ad484d602314b30183ea8496a9aa34a (diff)
parent25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff)
downloadlinux-fsl-qoriq-d59bf96cdde5b874a57bfd1425faa45da915d0b7.tar.xz
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 558c6ed..080ab03 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -98,8 +98,8 @@ config SOUND_HAL2
tristate "SGI HAL2 sound (EXPERIMENTAL)"
depends on SOUND_PRIME && SGI_IP22 && EXPERIMENTAL
help
- Say Y or M if you have an SGI Indy system and want to be able to
- use it's on-board A2 audio system.
+ Say Y or M if you have an SGI Indy or Indigo2 system and want to be able to
+ use its on-board A2 audio system.
config SOUND_IT8172
tristate "IT8172G Sound"