projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
dvb
/
audio.h
diff --git
a/include/linux/dvb/audio.h
b/include/linux/dvb/audio.h
index bb0df2aaebfa8676c029f13d58ff35fd48709166..fec66bd24f22d26429dda8c03a025d37c6508d4d 100644
(file)
--- a/
include/linux/dvb/audio.h
+++ b/
include/linux/dvb/audio.h
@@
-76,7
+76,7
@@
struct audio_karaoke{ /* if Vocal1 or Vocal2 are non-zero, they get mixed */
} audio_karaoke_t; /* into left and right */
-typedef
uint16_t
audio_attributes_t;
+typedef
__u16
audio_attributes_t;
/* bits: descr. */
/* 15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, */
/* 12 multichannel extension */