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 tag 'tty-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[firefly-linux-kernel-4.4.55.git]
/
sound
/
soc
/
ux500
/
ux500_msp_i2s.h
diff --git
a/sound/soc/ux500/ux500_msp_i2s.h
b/sound/soc/ux500/ux500_msp_i2s.h
index 258d0bcee0bd540aed67c757742f1a0f698f3a5f..875de0f68b8567dd3ec1d89213fbe849775ec563 100644
(file)
--- a/
sound/soc/ux500/ux500_msp_i2s.h
+++ b/
sound/soc/ux500/ux500_msp_i2s.h
@@
-475,7
+475,7
@@
struct ux500_msp_dma_params {
};
struct ux500_msp {
-
enum msp_i2s_id
id;
+
int
id;
void __iomem *registers;
struct device *dev;
struct ux500_msp_dma_params playback_dma_data;