Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[deliverable/linux.git] / drivers / gpu / drm / radeon / rs690.c

diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 0028db51ae75b9dc66a52181f4e68a51ee03a90b..025e3225346cc6a6902392fddcade5c1cce99134 100644 (file)
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -606,7 +606,7 @@ static int rs690_startup(struct radeon_device *rdev)
                return r;
        /* Enable IRQ */
        rdev->irq.sw_int = true;
-       r100_irq_set(rdev);
+       rs600_irq_set(rdev);
        /* 1M ring buffer */
        r = r100_cp_init(rdev, 1024 * 1024);
        if (r) {
@@ -647,7 +647,7 @@ int rs690_suspend(struct radeon_device *rdev)
 {
        r100_cp_disable(rdev);
        r100_wb_disable(rdev);
-       r100_irq_disable(rdev);
+       rs600_irq_disable(rdev);
        rs400_gart_disable(rdev);
        return 0;
 }
@@ -672,7 +672,6 @@ int rs690_init(struct radeon_device *rdev)
 {
        int r;
 
-       rdev->new_init_path = true;
        /* Disable VGA */
        rv515_vga_render_disable(rdev);
        /* Initialize scratch registers */