diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
index 29ef92f97f0cb1bd1f7f312eef86318a187b87cb..f838d9e277f05e4fb5c9ee724d1f028a560e07a2 100644
--- a/drivers/video/nuc900fb.c
+++ b/drivers/video/nuc900fb.c
@@ -696,6 +696,8 @@ static int nuc900fb_remove(struct platform_device *pdev)
 	nuc900fb_stop_lcd(fbinfo);
 	msleep(1);
 
+	unregister_framebuffer(fbinfo);
+	nuc900fb_cpufreq_deregister(fbi);
 	nuc900fb_unmap_video_memory(fbinfo);
 
 	iounmap(fbi->io);