diff options
author | Tejun Heo <tj@kernel.org> | 2013-06-13 22:38:26 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2013-06-13 22:42:22 -0400 |
commit | 2b0e53a7c8a6972755c0f0152d7fad2289fdc5eb (patch) | |
tree | bf427cbe4b9d85cd5651b01f2f18668e8d12ed45 /drivers/pwm/pwm-tegra.c | |
parent | ea15f8ccdb430af1e8bc9b4e19a230eb4c356777 (diff) | |
parent | dbece3a0f1ef0b19aff1cc6ed0942fec9ab98de1 (diff) |
Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into for-3.11
This is to receive percpu_refcount which will replace atomic_t
reference count in cgroup_subsys_state.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/pwm/pwm-tegra.c')
-rw-r--r-- | drivers/pwm/pwm-tegra.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/pwm/pwm-tegra.c b/drivers/pwm/pwm-tegra.c index 3d75f4a88f98..a5402933001f 100644 --- a/drivers/pwm/pwm-tegra.c +++ b/drivers/pwm/pwm-tegra.c | |||
@@ -181,11 +181,6 @@ static int tegra_pwm_probe(struct platform_device *pdev) | |||
181 | pwm->dev = &pdev->dev; | 181 | pwm->dev = &pdev->dev; |
182 | 182 | ||
183 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 183 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
184 | if (!r) { | ||
185 | dev_err(&pdev->dev, "no memory resources defined\n"); | ||
186 | return -ENODEV; | ||
187 | } | ||
188 | |||
189 | pwm->mmio_base = devm_ioremap_resource(&pdev->dev, r); | 184 | pwm->mmio_base = devm_ioremap_resource(&pdev->dev, r); |
190 | if (IS_ERR(pwm->mmio_base)) | 185 | if (IS_ERR(pwm->mmio_base)) |
191 | return PTR_ERR(pwm->mmio_base); | 186 | return PTR_ERR(pwm->mmio_base); |