diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-08 03:34:03 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-08 03:34:03 +0100 |
| commit | 2e18e047981ae04be9bd0d9760057f7c1a7b3785 (patch) | |
| tree | 999941abf466ce4d6915273e2e7a42bf0a107385 /drivers/gpu/drm/radeon/rs690.c | |
| parent | sh: Fix up hp6xx build. (diff) | |
| parent | sh: implement DMA_SLAVE capability in SH dmaengine driver (diff) | |
| download | linux-2e18e047981ae04be9bd0d9760057f7c1a7b3785.tar.xz linux-2e18e047981ae04be9bd0d9760057f7c1a7b3785.zip | |
Merge branch 'sh/dmaengine'
Conflicts:
arch/sh/drivers/dma/dma-sh.c
Diffstat (limited to 'drivers/gpu/drm/radeon/rs690.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rs690.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c index cd31da913771..06e2771aee5a 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c @@ -676,7 +676,6 @@ int rs690_suspend(struct radeon_device *rdev) void rs690_fini(struct radeon_device *rdev) { - rs690_suspend(rdev); r100_cp_fini(rdev); r100_wb_fini(rdev); r100_ib_fini(rdev); @@ -756,7 +755,6 @@ int rs690_init(struct radeon_device *rdev) if (r) { /* Somethings want wront with the accel init stop accel */ dev_err(rdev->dev, "Disabling GPU acceleration\n"); - rs690_suspend(rdev); r100_cp_fini(rdev); r100_wb_fini(rdev); r100_ib_fini(rdev); |