diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-25 08:37:05 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-25 08:37:05 -0400 |
| commit | 8e5d0661b3948f3c5a143f32d192710375822af2 (patch) | |
| tree | ca18920d3f7219f7ffb7ca2fa372b82558938006 /drivers/spi/spi-pl022.c | |
| parent | 39a6ac11df6579df0361922f05c43f0fac8daa37 (diff) | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
Merge tag 'v3.6-rc6' into spi-drivers
Linux 3.6-rc6
Conflicts:
drivers/spi/spi-omap2-mcspi.c
Diffstat (limited to 'drivers/spi/spi-pl022.c')
| -rw-r--r-- | drivers/spi/spi-pl022.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 3f2f36c79ab..f8568b43660 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c | |||
| @@ -2188,7 +2188,6 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id) | |||
| 2188 | printk(KERN_INFO "pl022: mapped registers from 0x%08x to %p\n", | 2188 | printk(KERN_INFO "pl022: mapped registers from 0x%08x to %p\n", |
| 2189 | adev->res.start, pl022->virtbase); | 2189 | adev->res.start, pl022->virtbase); |
| 2190 | 2190 | ||
| 2191 | pm_runtime_enable(dev); | ||
| 2192 | pm_runtime_resume(dev); | 2191 | pm_runtime_resume(dev); |
| 2193 | 2192 | ||
| 2194 | pl022->clk = clk_get(&adev->dev, NULL); | 2193 | pl022->clk = clk_get(&adev->dev, NULL); |