summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-03-18 18:22:50 +0100
committerTakashi Iwai <tiwai@suse.de>2012-03-18 18:22:50 +0100
commitca3e9297e29c48eebb010d0225ea580fbcc64c88 (patch)
treef0ad13e600e9c5a7c4357826b2b954642629d306 /include
parentcb3f2adc03ab055b19c677a6283523861fafebdd (diff)
parent53803aead010a314f76a8a6fa132fdcc5edf55ed (diff)
downloadlinux-next-ca3e9297e29c48eebb010d0225ea580fbcc64c88.tar.gz
Merge branch 'topic/jack' into for-linus
Diffstat (limited to 'include')
-rw-r--r--include/sound/jack.h3
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;