lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  Fix CONFIG_AC97_BUS dependency
This commit is contained in:
Linus Torvalds
2008-09-06 19:33:10 -07:00
parent a22a9a90cf 8a656496b2
commit 4747832b56
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/Kconfig
View File

@@ -91,6 +91,9 @@ endif # SOUND_PRIME
endif # !M68K endif # !M68K
endif # SOUND
# AC97_BUS is used from both sound and ucb1400
config AC97_BUS config AC97_BUS
tristate tristate
help help
@@ -99,4 +102,3 @@ config AC97_BUS
sound although they're sharing the AC97 bus. Concerned drivers sound although they're sharing the AC97 bus. Concerned drivers
should "select" this. should "select" this.
endif # SOUND