diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-12 17:47:08 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-12 17:47:08 -0500 |
| commit | 94bc2be31a01a3055ec94176e595dfe208e92d3b (patch) | |
| tree | ebfbe81c6718a6390bfa1b99c6d228237d818576 /sound/Kconfig | |
| parent | c32a0b689cb9cc160cfcd19735bbf50bb70c6ef4 (diff) | |
| parent | 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'sound/Kconfig')
| -rw-r--r-- | sound/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/Kconfig b/sound/Kconfig index d8f11408ce27..b65ee4701f98 100644 --- a/sound/Kconfig +++ b/sound/Kconfig | |||
| @@ -48,14 +48,6 @@ config SND | |||
| 48 | 48 | ||
| 49 | For more information, see <http://www.alsa-project.org/> | 49 | For more information, see <http://www.alsa-project.org/> |
| 50 | 50 | ||
| 51 | config SND_AC97_CODEC | ||
| 52 | tristate | ||
| 53 | select SND_PCM | ||
| 54 | select SND_AC97_BUS | ||
| 55 | |||
| 56 | config SND_AC97_BUS | ||
| 57 | tristate | ||
| 58 | |||
| 59 | source "sound/core/Kconfig" | 51 | source "sound/core/Kconfig" |
| 60 | 52 | ||
| 61 | source "sound/drivers/Kconfig" | 53 | source "sound/drivers/Kconfig" |