Merge with /shiny/git/linux-2.6/.git

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 47a6b12bc968..e7e8b52014c3 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -2521,6 +2521,11 @@ static void __devexit radeonfb_pci_unregister (struct pci_dev *pdev)
  
         radeonfb_pm_exit(rinfo);
 
+        if (rinfo->mon1_EDID)
+                sysfs_remove_bin_file(&rinfo->pdev->dev.kobj, &edid1_attr);
+        if (rinfo->mon2_EDID)
+                sysfs_remove_bin_file(&rinfo->pdev->dev.kobj, &edid2_attr);
+
 #if 0
         /* restore original state
          *