diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
| commit | 75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d (patch) | |
| tree | c2f02ee30609d0d69308b4ca80d68d02a5f85552 /sound | |
| parent | 0fd1ffe0633b4b039b343b753598e6df435e034d (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/oss/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 558c6ed443..080ab036b6 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig | |||
| @@ -98,8 +98,8 @@ config SOUND_HAL2 | |||
| 98 | tristate "SGI HAL2 sound (EXPERIMENTAL)" | 98 | tristate "SGI HAL2 sound (EXPERIMENTAL)" |
| 99 | depends on SOUND_PRIME && SGI_IP22 && EXPERIMENTAL | 99 | depends on SOUND_PRIME && SGI_IP22 && EXPERIMENTAL |
| 100 | help | 100 | help |
| 101 | Say Y or M if you have an SGI Indy system and want to be able to | 101 | Say Y or M if you have an SGI Indy or Indigo2 system and want to be able to |
| 102 | use it's on-board A2 audio system. | 102 | use its on-board A2 audio system. |
| 103 | 103 | ||
| 104 | config SOUND_IT8172 | 104 | config SOUND_IT8172 |
| 105 | tristate "IT8172G Sound" | 105 | tristate "IT8172G Sound" |