summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-04-15 11:24:09 +0200
committerTakashi Iwai <tiwai@suse.de>2009-04-15 11:24:09 +0200
commit2e8e59f437ce303fde2077cc5f84ce03c6ff1020 (patch)
tree49af09dab4d2ec3390d66bac3e55fd8defbba613 /include/sound
parent45c27fc8c89d39956930abeff8433c33d07a8d5f (diff)
parentff0c68d03b77ecb3a682137c42e947a4dc33e9b3 (diff)
downloadop-kernel-dev-2e8e59f437ce303fde2077cc5f84ce03c6ff1020.zip
op-kernel-dev-2e8e59f437ce303fde2077cc5f84ce03c6ff1020.tar.gz
Merge branch 'topic/hda' into for-linus
* topic/hda: ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883 ALSA: hda - Avoid call of snd_jack_report at release ALSA: add private_data to struct snd_jack
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/jack.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h
index 6b013c6..f236e42 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -50,6 +50,8 @@ struct snd_jack {
int type;
const char *id;
char name[100];
+ void *private_data;
+ void (*private_free)(struct snd_jack *);
};
#ifdef CONFIG_SND_JACK
OpenPOWER on IntegriCloud