git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: hda - fix beep tone calculation for IDT/STAC codecs
[pandora-kernel.git]
/
sound
/
pci
/
hda
/
patch_conexant.c
diff --git
a/sound/pci/hda/patch_conexant.c
b/sound/pci/hda/patch_conexant.c
index
4fcbe21
..
ac868c5
100644
(file)
--- a/
sound/pci/hda/patch_conexant.c
+++ b/
sound/pci/hda/patch_conexant.c
@@
-349,7
+349,7
@@
static int conexant_mux_enum_put(struct snd_kcontrol *kcontrol,
&spec->cur_mux[adc_idx]);
}
&spec->cur_mux[adc_idx]);
}
-#ifdef CONFIG_SND_JACK
+#ifdef CONFIG_SND_
HDA_INPUT_
JACK
static void conexant_free_jack_priv(struct snd_jack *jack)
{
struct conexant_jack *jacks = jack->private_data;
static void conexant_free_jack_priv(struct snd_jack *jack)
{
struct conexant_jack *jacks = jack->private_data;
@@
-463,7
+463,7
@@
static int conexant_init(struct hda_codec *codec)
static void conexant_free(struct hda_codec *codec)
{
static void conexant_free(struct hda_codec *codec)
{
-#ifdef CONFIG_SND_JACK
+#ifdef CONFIG_SND_
HDA_INPUT_
JACK
struct conexant_spec *spec = codec->spec;
if (spec->jacks.list) {
struct conexant_jack *jacks = spec->jacks.list;
struct conexant_spec *spec = codec->spec;
if (spec->jacks.list) {
struct conexant_jack *jacks = spec->jacks.list;