diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 10:09:44 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 10:09:44 -0400 |
| commit | 9f072b7b2260a588bfb5fb43418c3358104e7c13 (patch) | |
| tree | 055f1082093bb63a34c7bfe43c845567685d4675 /sound/soc/blackfin/bf5xx-sport.c | |
| parent | b1cd6b9ec7c749ddfad628c8c12659591ae195e6 (diff) | |
| parent | 0c31cf3e4af79ea18bbd365b07ef0de207673894 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
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) |