diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/um/Kconfig.char | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/um/Kconfig.char')
| -rw-r--r-- | arch/um/Kconfig.char | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/um/Kconfig.char b/arch/um/Kconfig.char index 1b238ebae6b3..70dabd1e0652 100644 --- a/arch/um/Kconfig.char +++ b/arch/um/Kconfig.char | |||
| @@ -203,6 +203,10 @@ config SOUND | |||
| 203 | tristate | 203 | tristate |
| 204 | default UML_SOUND | 204 | default UML_SOUND |
| 205 | 205 | ||
| 206 | config SOUND_OSS_CORE | ||
| 207 | bool | ||
| 208 | default UML_SOUND | ||
| 209 | |||
| 206 | config HOSTAUDIO | 210 | config HOSTAUDIO |
| 207 | tristate | 211 | tristate |
| 208 | default UML_SOUND | 212 | default UML_SOUND |