summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-06 19:33:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-06 19:33:10 -0700
commit4747832b56a95dbeb0cef4714e6fcc766eed0a95 (patch)
tree48245f5eddd9a9222643d0405c18fc3e97dc79ce
parenta22a9a90cfbcc91c3e0f8dc8549535e2786d3e7e (diff)
parent8a656496b21efd95fd55b66e0601c5ad41f9b156 (diff)
downloadblackbird-op-linux-4747832b56a95dbeb0cef4714e6fcc766eed0a95.tar.gz
blackbird-op-linux-4747832b56a95dbeb0cef4714e6fcc766eed0a95.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: Fix CONFIG_AC97_BUS dependency
-rw-r--r--sound/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/Kconfig b/sound/Kconfig
index a37bee094eba..8ebf512ced6c 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -91,6 +91,9 @@ endif # SOUND_PRIME
endif # !M68K
+endif # SOUND
+
+# AC97_BUS is used from both sound and ucb1400
config AC97_BUS
tristate
help
@@ -99,4 +102,3 @@ config AC97_BUS
sound although they're sharing the AC97 bus. Concerned drivers
should "select" this.
-endif # SOUND
OpenPOWER on IntegriCloud