diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-10-03 12:31:22 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-10-03 12:31:22 -0400 |
| commit | a1cb9cd69750d6d62251393738efc02d252b67d3 (patch) | |
| tree | 5c68b23180e6ca127d1048cdbf723ca447551123 /sound/soc/blackfin/bf5xx-sport.c | |
| parent | 08d1e635089f41e28fec644a8620a0e8d66b1235 (diff) | |
| parent | 834eb6c599a8efa1fe9b77d469562e0c78c876e1 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/blackfin/bf5xx-sport.c')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-sport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/blackfin/bf5xx-sport.c b/sound/soc/blackfin/bf5xx-sport.c index 469ce7fab20c..99051ff0954e 100644 --- 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) | |||
| 326 | 326 | ||
| 327 | int sport_tx_start(struct sport_device *sport) | 327 | int sport_tx_start(struct sport_device *sport) |
| 328 | { | 328 | { |
| 329 | unsigned flags; | 329 | unsigned long flags; |
| 330 | pr_debug("%s: tx_run:%d, rx_run:%d\n", __func__, | 330 | pr_debug("%s: tx_run:%d, rx_run:%d\n", __func__, |
| 331 | sport->tx_run, sport->rx_run); | 331 | sport->tx_run, sport->rx_run); |
| 332 | if (sport->tx_run) | 332 | if (sport->tx_run) |