diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 13:05:51 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 13:05:51 +0400 |
commit | accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6 (patch) | |
tree | 8fb40782e79472ed882ff2098d4dd295557278ee /arch/um/Kconfig.char | |
parent | 6852fd9b86d05063c6ef49d2e12e061cc7f6a105 (diff) | |
parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
download | linux-accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6.tar.xz |
Merge branch 'linus' into oprofile-v2
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.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 tristate default UML_SOUND +config SOUND_OSS_CORE + bool + default UML_SOUND + config HOSTAUDIO tristate default UML_SOUND |