diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-15 05:24:09 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-15 05:24:09 -0400 |
| commit | 2e8e59f437ce303fde2077cc5f84ce03c6ff1020 (patch) | |
| tree | 49af09dab4d2ec3390d66bac3e55fd8defbba613 /include/sound | |
| parent | 45c27fc8c89d39956930abeff8433c33d07a8d5f (diff) | |
| parent | ff0c68d03b77ecb3a682137c42e947a4dc33e9b3 (diff) | |
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.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h index 6b013c6f6a04..f236e426a706 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h | |||
| @@ -50,6 +50,8 @@ struct snd_jack { | |||
| 50 | int type; | 50 | int type; |
| 51 | const char *id; | 51 | const char *id; |
| 52 | char name[100]; | 52 | char name[100]; |
| 53 | void *private_data; | ||
| 54 | void (*private_free)(struct snd_jack *); | ||
| 53 | }; | 55 | }; |
| 54 | 56 | ||
| 55 | #ifdef CONFIG_SND_JACK | 57 | #ifdef CONFIG_SND_JACK |