mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'topic/misc' into for-linus
This commit is contained in:
commit
e0d2054fd3
60 changed files with 491 additions and 277 deletions
|
|
@ -450,7 +450,7 @@ struct snd_pcm_notify {
|
|||
|
||||
extern const struct file_operations snd_pcm_f_ops[2];
|
||||
|
||||
int snd_pcm_new(struct snd_card *card, char *id, int device,
|
||||
int snd_pcm_new(struct snd_card *card, const char *id, int device,
|
||||
int playback_count, int capture_count,
|
||||
struct snd_pcm **rpcm);
|
||||
int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count);
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
/* include/version.h */
|
||||
#define CONFIG_SND_VERSION "1.0.18a"
|
||||
#define CONFIG_SND_VERSION "1.0.19"
|
||||
#define CONFIG_SND_DATE ""
|
||||
|
|
|
|||
Loading…
Reference in a new issue