Merge branch 'master' into for-upstream

[deliverable/linux.git] / sound / soc / blackfin / bf5xx-sport.h

diff --git a/sound/soc/blackfin/bf5xx-sport.h b/sound/soc/blackfin/bf5xx-sport.h
index 4c163454bbf8410570e2f8e43cf06da224cae66e..fcadcc081f7fe4994a2dc3dbc0514656c7c6cd06 100644 (file)
--- a/sound/soc/blackfin/bf5xx-sport.h
+++ b/sound/soc/blackfin/bf5xx-sport.h
@@ -123,6 +123,8 @@ struct sport_device {
        int rx_pos;
        unsigned int tx_buffer_size;
        unsigned int rx_buffer_size;
+       int tx_delay_pos;
+       int once;
 #endif
        void *private_data;
 };