Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi

[~andy/linux] / drivers / gpu / drm / radeon / radeon_device.c

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 49f7cb7e226b893a4a95a068b25179a30f93c892..ea7df16e2f84f267f0a129fac762333b96d54b56 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -89,6 +89,10 @@ static const char radeon_family_name[][16] = {
        "TURKS",
        "CAICOS",
        "CAYMAN",
+       "ARUBA",
+       "TAHITI",
+       "PITCAIRN",
+       "VERDE",
        "LAST",
 };
 
@@ -964,7 +968,7 @@ int radeon_resume_kms(struct drm_device *dev)
        /* init dig PHYs, disp eng pll */
        if (rdev->is_atom_bios) {
                radeon_atom_encoder_init(rdev);
-               radeon_atom_dcpll_init(rdev);
+               radeon_atom_disp_eng_pll_init(rdev);
        }
        /* reset hpd state */
        radeon_hpd_init(rdev);