OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sound-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[uclinux-h8/linux.git]
/
sound
/
pci
/
oxygen
/
xonar_wm87x6.c
diff --git
a/sound/pci/oxygen/xonar_wm87x6.c
b/sound/pci/oxygen/xonar_wm87x6.c
index
6ce6860
..
90ac479
100644
(file)
--- a/
sound/pci/oxygen/xonar_wm87x6.c
+++ b/
sound/pci/oxygen/xonar_wm87x6.c
@@
-286,7
+286,7
@@
static void xonar_ds_init(struct oxygen *chip)
xonar_enable_output(chip);
snd_jack_new(chip->card, "Headphone",
- SND_JACK_HEADPHONE, &data->hp_jack);
+ SND_JACK_HEADPHONE, &data->hp_jack
, false, false
);
xonar_ds_handle_hp_jack(chip);
snd_component_add(chip->card, "WM8776");