Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / sound / soc / blackfin / bf5xx-sport.c

diff --git a/sound/soc/blackfin/bf5xx-sport.c b/sound/soc/blackfin/bf5xx-sport.c
index 469ce7fab20ca6aad3d6474d8c63deeacb3f5101..99051ff0954e6ffe6772d0ee4957ee53e4d3ebc4 100644 (file)
--- a/sound/soc/blackfin/bf5xx-sport.c
+++ b/sound/soc/blackfin/bf5xx-sport.c
@@ -326,7 +326,7 @@ static inline int sport_hook_tx_dummy(struct sport_device *sport)
 
 int sport_tx_start(struct sport_device *sport)
 {
-       unsigned flags;
+       unsigned long flags;
        pr_debug("%s: tx_run:%d, rx_run:%d\n", __func__,
                        sport->tx_run, sport->rx_run);
        if (sport->tx_run)