diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-17 04:16:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-17 04:17:47 -0500 |
| commit | a7b63425a41cd6a8d50f76fef0660c5110f97e91 (patch) | |
| tree | be17ee121f1c8814d8d39c9f3e0205d9397fab54 /sound/pci/Kconfig | |
| parent | 35039eb6b199749943547c8572be6604edf00229 (diff) | |
| parent | 3726cc75e581c157202da93bb2333cce25c15c98 (diff) | |
Merge branch 'perf/core' into perf/probes
Resolved merge conflict in tools/perf/Makefile
Merge reason: we want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/pci/Kconfig')
| -rw-r--r-- | sound/pci/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index fb5ee3cc3968..75c602b5b132 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
| @@ -259,7 +259,6 @@ config SND_CS5530 | |||
| 259 | 259 | ||
| 260 | config SND_CS5535AUDIO | 260 | config SND_CS5535AUDIO |
| 261 | tristate "CS5535/CS5536 Audio" | 261 | tristate "CS5535/CS5536 Audio" |
| 262 | depends on X86 && !X86_64 | ||
| 263 | select SND_PCM | 262 | select SND_PCM |
| 264 | select SND_AC97_CODEC | 263 | select SND_AC97_CODEC |
| 265 | help | 264 | help |