diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/spi/spi_stmp.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/spi/spi_stmp.c')
| -rw-r--r-- | drivers/spi/spi_stmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_stmp.c b/drivers/spi/spi_stmp.c index 2552bb364005..fadff76eb7e0 100644 --- a/drivers/spi/spi_stmp.c +++ b/drivers/spi/spi_stmp.c | |||
| @@ -76,7 +76,7 @@ struct stmp_spi { | |||
| 76 | break; \ | 76 | break; \ |
| 77 | } \ | 77 | } \ |
| 78 | cpu_relax(); \ | 78 | cpu_relax(); \ |
| 79 | } while (time_before(end_jiffies, jiffies)); \ | 79 | } while (time_before(jiffies, end_jiffies)); \ |
| 80 | succeeded; \ | 80 | succeeded; \ |
| 81 | }) | 81 | }) |
| 82 | 82 | ||