combine ifdef blocks

from Ted Bullock

diff --git a/sys/dev/pci/drm/radeon/radeon_kms.c b/sys/dev/pci/drm/radeon/radeon_kms.c
index e298bd8..1aa439b 100644 (file)
--- a/sys/dev/pci/drm/radeon/radeon_kms.c
+++ b/sys/dev/pci/drm/radeon/radeon_kms.c
@@ -810,17 +810,13 @@ radeondrm_attachhook(struct device *self)
 
 #ifdef __sparc64__
        fbwscons_setcolormap(&rdev->sf, radeondrm_setcolor);
+       ri = &rdev->sf.sf_ro;
 #else
        radeondrm_setpal(rdev, ri);
-#endif
-
-#ifndef __sparc64__
        ri->ri_flg = RI_CENTER | RI_VCONS | RI_WRONLY;
        rasops_init(ri, 160, 160);
 
        ri->ri_hw = rdev;
-#else
-       ri = &rdev->sf.sf_ro;
 #endif
 
        radeondrm_stdscreen.capabilities = ri->ri_caps;