Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

1 files changed, 31 insertions, 0 deletions

diff --git a/include/uapi/linux/sound.h b/include/uapi/linux/sound.h
new file mode 100644
index 000000000000..014c9117c224
--- /dev/null
+++ b/include/uapi/linux/sound.h
@@ -0,0 +1,31 @@
+#ifndef _UAPI_LINUX_SOUND_H
+#define _UAPI_LINUX_SOUND_H
+
+/*
+ * Minor numbers for the sound driver.
+ */
+
+#include <linux/fs.h>
+
+#define SND_DEV_CTL             0       /* Control port /dev/mixer */
+#define SND_DEV_SEQ             1       /* Sequencer output /dev/sequencer (FM
+                                                synthesizer and MIDI output) */
+#define SND_DEV_MIDIN           2       /* Raw midi access */
+#define SND_DEV_DSP             3       /* Digitized voice /dev/dsp */
+#define SND_DEV_AUDIO           4       /* Sparc compatible /dev/audio */
+#define SND_DEV_DSP16           5       /* Like /dev/dsp but 16 bits/sample */
+/* #define SND_DEV_STATUS       6 */    /* /dev/sndstat (obsolete) */
+#define SND_DEV_UNUSED          6
+#define SND_DEV_AWFM            7       /* Reserved */
+#define SND_DEV_SEQ2            8       /* /dev/sequencer, level 2 interface */
+/* #define SND_DEV_SNDPROC      9 */    /* /dev/sndproc for programmable devices (not used) */
+/* #define SND_DEV_DMMIDI       9 */
+#define SND_DEV_SYNTH           9       /* Raw synth access /dev/synth (same as /dev/dmfm) */
+#define SND_DEV_DMFM            10      /* Raw synth access /dev/dmfm */
+#define SND_DEV_UNKNOWN11       11
+#define SND_DEV_ADSP            12      /* Like /dev/dsp (obsolete) */
+#define SND_DEV_AMIDI           13      /* Like /dev/midi (obsolete) */
+#define SND_DEV_ADMMIDI         14      /* Like /dev/dmmidi (onsolete) */
+
+
+#endif /* _UAPI_LINUX_SOUND_H */