Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
88cacc57
Commit
88cacc57
authored
Feb 23, 2015
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/uapi-fix' into for-next
parents
6176fadc
b9956409
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
2 deletions
+11
-2
include/uapi/sound/asequencer.h
include/uapi/sound/asequencer.h
+1
-0
include/uapi/sound/asound.h
include/uapi/sound/asound.h
+3
-0
include/uapi/sound/emu10k1.h
include/uapi/sound/emu10k1.h
+1
-2
include/uapi/sound/hdspm.h
include/uapi/sound/hdspm.h
+6
-0
No files found.
include/uapi/sound/asequencer.h
View file @
88cacc57
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#ifndef _UAPI__SOUND_ASEQUENCER_H
#ifndef _UAPI__SOUND_ASEQUENCER_H
#define _UAPI__SOUND_ASEQUENCER_H
#define _UAPI__SOUND_ASEQUENCER_H
#include <sound/asound.h>
/** version of the sequencer */
/** version of the sequencer */
#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1)
#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1)
...
...
include/uapi/sound/asound.h
View file @
88cacc57
...
@@ -25,6 +25,9 @@
...
@@ -25,6 +25,9 @@
#include <linux/types.h>
#include <linux/types.h>
#ifndef __KERNEL__
#include <stdlib.h>
#endif
/*
/*
* protocol version
* protocol version
...
...
include/uapi/sound/emu10k1.h
View file @
88cacc57
...
@@ -23,8 +23,7 @@
...
@@ -23,8 +23,7 @@
#define _UAPI__SOUND_EMU10K1_H
#define _UAPI__SOUND_EMU10K1_H
#include <linux/types.h>
#include <linux/types.h>
#include <sound/asound.h>
/*
/*
* ---- FX8010 ----
* ---- FX8010 ----
...
...
include/uapi/sound/hdspm.h
View file @
88cacc57
...
@@ -20,6 +20,12 @@
...
@@ -20,6 +20,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
*/
#ifdef __KERNEL__
#include <linux/types.h>
#else
#include <stdint.h>
#endif
/* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */
/* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */
#define HDSPM_MAX_CHANNELS 64
#define HDSPM_MAX_CHANNELS 64
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment