diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-26 16:39:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-27 12:28:43 -0400 |
| commit | 6e15cf04860074ad032e88c306bea656bbdd0f22 (patch) | |
| tree | c346383bb7563e8d66b2f4a502f875b259c34870 /sound | |
| parent | be0ea69674ed95e1e98cb3687a241badc756d228 (diff) | |
| parent | 60db56422043aaa455ac7f858ce23c273220f9d9 (diff) | |
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
Conflicts:
arch/parisc/kernel/irq.c
arch/x86/include/asm/fixmap_64.h
arch/x86/include/asm/setup.h
kernel/irq/handle.c
Semantic merge:
arch/x86/include/asm/fixmap.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/drivers/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig index 0bcf14640fde..84714a65e5c8 100644 --- a/sound/drivers/Kconfig +++ b/sound/drivers/Kconfig | |||
| @@ -33,7 +33,7 @@ if SND_DRIVERS | |||
| 33 | 33 | ||
| 34 | config SND_PCSP | 34 | config SND_PCSP |
| 35 | tristate "PC-Speaker support (READ HELP!)" | 35 | tristate "PC-Speaker support (READ HELP!)" |
| 36 | depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS | 36 | depends on PCSPKR_PLATFORM && X86 && HIGH_RES_TIMERS |
| 37 | depends on INPUT | 37 | depends on INPUT |
| 38 | depends on EXPERIMENTAL | 38 | depends on EXPERIMENTAL |
| 39 | select SND_PCM | 39 | select SND_PCM |