Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

[~andy/linux] / include / sound / saif.h

diff --git a/include/sound/saif.h b/include/sound/saif.h
index d0e0de7984ecb300b160bd6523e70a566d14636f..f22f3e16edf46d082b49849116001f65be8fde73 100644 (file)
--- a/include/sound/saif.h
+++ b/include/sound/saif.h
@@ -10,7 +10,7 @@
 #define __SOUND_SAIF_H__
 
 struct mxs_saif_platform_data {
-       int (*init) (void);
-       int (*get_master_id) (unsigned int saif_id);
+       bool master_mode;       /* if true use master mode */
+       int master_id;          /* id of the master if in slave mode */
 };
 #endif