aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/aty
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2005-07-28 09:03:36 -0500
committerDave Kleikamp <shaggy@austin.ibm.com>2005-07-28 09:03:36 -0500
commitda28c12089dfcfb8695b6b555cdb8e03dda2b690 (patch)
treeb3ff509f21352ef053cb3d490cb13528090d32ac /drivers/video/aty
parent6de7dc2c4c713d037c19aa1e310d240f16973414 (diff)
parent577a4f8102d54b504cb22eb021b89e957e8df18f (diff)
downloadkernel_samsung_smdk4412-da28c12089dfcfb8695b6b555cdb8e03dda2b690.tar.gz
kernel_samsung_smdk4412-da28c12089dfcfb8695b6b555cdb8e03dda2b690.tar.bz2
kernel_samsung_smdk4412-da28c12089dfcfb8695b6b555cdb8e03dda2b690.zip
Merge with /home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/ /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'drivers/video/aty')
-rw-r--r--drivers/video/aty/radeon_base.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 47a6b12bc96..e7e8b52014c 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
*