Merge tag 'fbdev-3.11-2' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next

Various fbdev changes for 3.11

* xilinxfb updates
* Small cleanups and fixes to multiple drivers

1 files changed, 0 insertions, 2 deletions

diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 76a0e7fbd692..21a32adbb8ea 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -1005,7 +1005,6 @@ release_regs:
 release_mem:
         release_mem_region(res->start, size);
 dealloc_fb:
-        platform_set_drvdata(pdev, NULL);
         framebuffer_release(fbinfo);
         return ret;
 }
@@ -1051,7 +1050,6 @@ static int s3c2410fb_remove(struct platform_device *pdev)
 
         release_mem_region(info->mem->start, resource_size(info->mem));
 
-        platform_set_drvdata(pdev, NULL);
         framebuffer_release(fbinfo);
 
         return 0;