diff options
| author | Takashi Iwai | 2012-03-18 18:22:50 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2012-03-18 18:22:50 +0100 |
| commit | ca3e9297e29c48eebb010d0225ea580fbcc64c88 (patch) | |
| tree | f0ad13e600e9c5a7c4357826b2b954642629d306 /include/sound | |
| parent | Merge branch 'topic/asoc' into for-linus (diff) | |
| parent | ALSA: Use a define for the number of jack switch types (diff) | |
| download | kernel-qcow2-linux-ca3e9297e29c48eebb010d0225ea580fbcc64c88.tar.gz kernel-qcow2-linux-ca3e9297e29c48eebb010d0225ea580fbcc64c88.tar.xz kernel-qcow2-linux-ca3e9297e29c48eebb010d0225ea580fbcc64c88.zip | |
Merge branch 'topic/jack' into for-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/jack.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h index 63c790742db4..58916573db58 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -53,6 +53,9 @@ enum snd_jack_types { SND_JACK_BTN_5 = 0x0200, }; +/* Keep in sync with definitions above */ +#define SND_JACK_SWITCH_TYPES 6 + struct snd_jack { struct input_dev *input_dev; int registered; |