diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /drivers/video | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbmem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 1194f5e060ea..01072f4b3e8f 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
| @@ -1521,6 +1521,7 @@ module_init(fbmem_init); | |||
| 1521 | static void __exit | 1521 | static void __exit |
| 1522 | fbmem_exit(void) | 1522 | fbmem_exit(void) |
| 1523 | { | 1523 | { |
| 1524 | remove_proc_entry("fb", NULL); | ||
| 1524 | class_destroy(fb_class); | 1525 | class_destroy(fb_class); |
| 1525 | unregister_chrdev(FB_MAJOR, "fb"); | 1526 | unregister_chrdev(FB_MAJOR, "fb"); |
| 1526 | } | 1527 | } |