tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 4747832b a22a9a90

+3 -1
unified split
+3 -1
sound/Kconfig
··· 91 91 92 92 endif # !M68K 93 93 94 + endif # SOUND 95 + 96 + # AC97_BUS is used from both sound and ucb1400 94 97 config AC97_BUS 95 98 tristate 96 99 help ··· 102 99 sound although they're sharing the AC97 bus. Concerned drivers 103 100 should "select" this. 104 101 105 - endif # SOUND