diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/spi/pxa2xx_spi.c | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'drivers/spi/pxa2xx_spi.c')
| -rw-r--r-- | drivers/spi/pxa2xx_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index 654bb58be630..0c452c46ab07 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
| @@ -1567,7 +1567,7 @@ static int pxa2xx_spi_resume(struct platform_device *pdev) | |||
| 1567 | int status = 0; | 1567 | int status = 0; |
| 1568 | 1568 | ||
| 1569 | /* Enable the SSP clock */ | 1569 | /* Enable the SSP clock */ |
| 1570 | clk_disable(ssp->clk); | 1570 | clk_enable(ssp->clk); |
| 1571 | 1571 | ||
| 1572 | /* Start the queue running */ | 1572 | /* Start the queue running */ |
| 1573 | status = start_queue(drv_data); | 1573 | status = start_queue(drv_data); |