diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2010-10-25 09:56:32 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-25 09:56:32 +0200 |
| commit | 79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703 (patch) | |
| tree | e32a4c267dc1b5950012e18c1e71d8057140f1f5 /include/sound/jack.h | |
| parent | Linux 2.6.36 (diff) | |
| parent | ALSA: usb - Creative USB X-Fi volume knob support (diff) | |
| download | linux-dev-79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703.tar.xz linux-dev-79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'include/sound/jack.h')
| -rw-r--r-- | include/sound/jack.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h index d90b9fa32707..c140fc7cbd3f 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -47,6 +47,9 @@ enum snd_jack_types { SND_JACK_BTN_0 = 0x4000, SND_JACK_BTN_1 = 0x2000, SND_JACK_BTN_2 = 0x1000, + SND_JACK_BTN_3 = 0x0800, + SND_JACK_BTN_4 = 0x0400, + SND_JACK_BTN_5 = 0x0200, }; struct snd_jack { @@ -55,7 +58,7 @@ struct snd_jack { int type; const char *id; char name[100]; - unsigned int key[3]; /* Keep in sync with definitions above */ + unsigned int key[6]; /* Keep in sync with definitions above */ void *private_data; void (*private_free)(struct snd_jack *); }; |