diff --git a/drivers/video/drm/radeon/fwblob.asm b/drivers/video/drm/radeon/fwblob.asm
index b41614c800..325cab3560 100644
--- a/drivers/video/drm/radeon/fwblob.asm
+++ b/drivers/video/drm/radeon/fwblob.asm
@@ -44,6 +44,10 @@ ___start_builtin_fw:
         dd RS690CP_START
         dd (RS690CP_END - RS690CP_START)
 
+        dd FIRMWARE_R600_ME
+        dd R600ME_START
+        dd (R600ME_END - R600ME_START)
+
         dd FIRMWARE_RS780_ME
         dd RS780ME_START
         dd (RS780ME_END - RS780ME_START)
@@ -142,6 +146,7 @@ FIRMWARE_RS690_CP       db 'radeon/RS690_cp.bin',0
 FIRMWARE_RS780_ME       db 'radeon/RS780_me.bin',0
 FIRMWARE_RS780_PFP      db 'radeon/RS780_pfp.bin',0
 
+FIRMWARE_R600_ME        db 'radeon/RV600_me.bin',0
 FIRMWARE_RV610_ME       db 'radeon/RV610_me.bin',0
 FIRMWARE_RV620_ME       db 'radeon/RV620_me.bin',0
 FIRMWARE_RV630_ME       db 'radeon/RV630_me.bin',0
@@ -151,6 +156,7 @@ FIRMWARE_RV710_ME       db 'radeon/RV710_me.bin',0
 FIRMWARE_RV730_ME       db 'radeon/RV730_me.bin',0
 FIRMWARE_RV770_ME       db 'radeon/RV770_me.bin',0
 
+FIRMWARE_R600_PFP       db 'radeon/R600_pfp.bin',0
 FIRMWARE_RV610_PFP      db 'radeon/RV610_pfp.bin',0
 FIRMWARE_RV620_PFP      db 'radeon/RV620_pfp.bin',0
 FIRMWARE_RV630_PFP      db 'radeon/RV630_pfp.bin',0
@@ -209,6 +215,11 @@ RS780PFP_START:
         file 'firmware/rs780_pfp.bin'
 RS780PFP_END:
 
+align 16
+R600ME_START:
+        file 'firmware/r600_me.bin'
+R600ME_END:
+
 align 16
 RV610ME_START:
         file 'firmware/rv610_me.bin'
diff --git a/drivers/video/drm/radeon/r100.c b/drivers/video/drm/radeon/r100.c
index d6039b56ec..cdebb2b85f 100644
--- a/drivers/video/drm/radeon/r100.c
+++ b/drivers/video/drm/radeon/r100.c
@@ -2980,7 +2980,6 @@ int r100_init(struct radeon_device *rdev)
 	if (r) {
 		/* Somethings want wront with the accel init stop accel */
 		dev_err(rdev->dev, "Disabling GPU acceleration\n");
-//		r100_suspend(rdev);
 //		r100_cp_fini(rdev);
 //		r100_wb_fini(rdev);
 //		r100_ib_fini(rdev);
diff --git a/drivers/video/drm/radeon/r300.c b/drivers/video/drm/radeon/r300.c
index 8101782618..d28cac1d02 100644
--- a/drivers/video/drm/radeon/r300.c
+++ b/drivers/video/drm/radeon/r300.c
@@ -1381,7 +1381,6 @@ int r300_init(struct radeon_device *rdev)
 	if (r) {
 		/* Somethings want wront with the accel init stop accel */
 		dev_err(rdev->dev, "Disabling GPU acceleration\n");
-//		r300_suspend(rdev);
 //		r100_cp_fini(rdev);
 //		r100_wb_fini(rdev);
 //		r100_ib_fini(rdev);
diff --git a/drivers/video/drm/radeon/radeon_device.c b/drivers/video/drm/radeon/radeon_device.c
index 66d1359f4a..a5dc0cdf95 100644
--- a/drivers/video/drm/radeon/radeon_device.c
+++ b/drivers/video/drm/radeon/radeon_device.c
@@ -825,12 +825,6 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent)
     if (ret)
         goto err_g4;
 
- //   list_add_tail(&dev->driver_item, &driver->device_list);
-
- //   DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
- //        driver->name, driver->major, driver->minor, driver->patchlevel,
- //        driver->date, pci_name(pdev), dev->primary->index);
-
     if( radeon_modeset )
         init_display_kms(dev->dev_private, &usermode);
     else