diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-19 08:39:58 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-19 08:39:58 -0400 |
| commit | 14b6848bc0134b8838d374c423df3edda9b1490e (patch) | |
| tree | 724dc912efe84f432d33a798502811c5f5295774 /drivers/spi/omap2_mcspi.c | |
| parent | 05d9881bc4c6f172997b7a59e4a1a95910c4ebd7 (diff) | |
| parent | 4da3782151300237db3abe070f716922889252e0 (diff) | |
Merge branch 'omap-clks3' into devel
Conflicts:
arch/arm/mach-omap2/clock.c
Diffstat (limited to 'drivers/spi/omap2_mcspi.c')
| -rw-r--r-- | drivers/spi/omap2_mcspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index 454a2712e629..b91ee1ae975d 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c | |||
| @@ -1021,13 +1021,13 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) | |||
| 1021 | spin_lock_init(&mcspi->lock); | 1021 | spin_lock_init(&mcspi->lock); |
| 1022 | INIT_LIST_HEAD(&mcspi->msg_queue); | 1022 | INIT_LIST_HEAD(&mcspi->msg_queue); |
| 1023 | 1023 | ||
| 1024 | mcspi->ick = clk_get(&pdev->dev, "mcspi_ick"); | 1024 | mcspi->ick = clk_get(&pdev->dev, "ick"); |
| 1025 | if (IS_ERR(mcspi->ick)) { | 1025 | if (IS_ERR(mcspi->ick)) { |
| 1026 | dev_dbg(&pdev->dev, "can't get mcspi_ick\n"); | 1026 | dev_dbg(&pdev->dev, "can't get mcspi_ick\n"); |
| 1027 | status = PTR_ERR(mcspi->ick); | 1027 | status = PTR_ERR(mcspi->ick); |
| 1028 | goto err1a; | 1028 | goto err1a; |
| 1029 | } | 1029 | } |
| 1030 | mcspi->fck = clk_get(&pdev->dev, "mcspi_fck"); | 1030 | mcspi->fck = clk_get(&pdev->dev, "fck"); |
| 1031 | if (IS_ERR(mcspi->fck)) { | 1031 | if (IS_ERR(mcspi->fck)) { |
| 1032 | dev_dbg(&pdev->dev, "can't get mcspi_fck\n"); | 1032 | dev_dbg(&pdev->dev, "can't get mcspi_fck\n"); |
| 1033 | status = PTR_ERR(mcspi->fck); | 1033 | status = PTR_ERR(mcspi->fck); |