diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
| commit | b2382b363df828f25e35ed8b70a3da33b29b2a64 (patch) | |
| tree | 23aa2e70ba4650390c9281b3696172313bdb0f38 /sound/Kconfig | |
| parent | 1b5cca3a88b7682d538d129c25f0e3092613a243 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
| download | kernel-crypto-b2382b363df828f25e35ed8b70a3da33b29b2a64.tar.gz kernel-crypto-b2382b363df828f25e35ed8b70a3da33b29b2a64.tar.xz kernel-crypto-b2382b363df828f25e35ed8b70a3da33b29b2a64.zip | |
Merge upstream into ieee80211.
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
Diffstat (limited to 'sound/Kconfig')
| -rw-r--r-- | sound/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/Kconfig b/sound/Kconfig index ee794ae0604..b65ee4701f9 100644 --- a/sound/Kconfig +++ b/sound/Kconfig @@ -77,7 +77,7 @@ source "sound/parisc/Kconfig" endmenu menu "Open Sound System" - depends on SOUND!=n && (BROKEN || (!SPARC32 && !SPARC64)) + depends on SOUND!=n config SOUND_PRIME tristate "Open Sound System (DEPRECATED)" |