From 9316dde89222701e3f519c0bb4144dc79ad52c3c Mon Sep 17 00:00:00 2001
From: Jaya Kumar <jayakumar.arm@gmail.com>
Date: Sun, 22 Jun 2008 04:27:28 +0100
Subject: [PATCH] --- yaml --- r: 100895 b: refs/heads/master c:
 9f17f2874834f4cdbe48cc05676d8f7558793204 h: refs/heads/master i:   100893:
 a546798773974dd9a69f135d5170dab72e21ee2f   100891:
 1914eede47274d5585927cb3572a1f937fbb7e2d   100887:
 974f2095af6ffc4d420590de27c0272cf0c3db65   100879:
 39dab16658607eabf2da70e3f89c90d66ad0c647   100863:
 70aa5b69b82798fa867bd40fbd7187fab9e2fa32 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/video/pxafb.c | 44 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 81fdecb261a3..482364a9e3e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a2cc50f166babc26103279c4fbc9f2bf73b79de
+refs/heads/master: 9f17f2874834f4cdbe48cc05676d8f7558793204
diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c
index 3ee314beacc1..3682bbd7e50e 100644
--- a/trunk/drivers/video/pxafb.c
+++ b/trunk/drivers/video/pxafb.c
@@ -1777,11 +1777,49 @@ static int __init pxafb_probe(struct platform_device *dev)
 	return ret;
 }
 
+static int __devexit pxafb_remove(struct platform_device *dev)
+{
+	struct pxafb_info *fbi = platform_get_drvdata(dev);
+	struct resource *r;
+	int irq;
+	struct fb_info *info;
+
+	if (!fbi)
+		return 0;
+
+	info = &fbi->fb;
+
+	unregister_framebuffer(info);
+
+	pxafb_disable_controller(fbi);
+
+	if (fbi->fb.cmap.len)
+		fb_dealloc_cmap(&fbi->fb.cmap);
+
+	irq = platform_get_irq(dev, 0);
+	free_irq(irq, fbi);
+
+	dma_free_writecombine(&dev->dev, fbi->map_size,
+					fbi->map_cpu, fbi->map_dma);
+
+	iounmap(fbi->mmio_base);
+
+	r = platform_get_resource(dev, IORESOURCE_MEM, 0);
+	release_mem_region(r->start, r->end - r->start + 1);
+
+	clk_put(fbi->clk);
+	kfree(fbi);
+
+	return 0;
+}
+
 static struct platform_driver pxafb_driver = {
 	.probe		= pxafb_probe,
+	.remove 	= pxafb_remove,
 	.suspend	= pxafb_suspend,
 	.resume		= pxafb_resume,
 	.driver		= {
+		.owner	= THIS_MODULE,
 		.name	= "pxa2xx-fb",
 	},
 };
@@ -1794,7 +1832,13 @@ static int __devinit pxafb_init(void)
 	return platform_driver_register(&pxafb_driver);
 }
 
+static void __exit pxafb_exit(void)
+{
+	platform_driver_unregister(&pxafb_driver);
+}
+
 module_init(pxafb_init);
+module_exit(pxafb_exit);
 
 MODULE_DESCRIPTION("loadable framebuffer driver for PXA");
 MODULE_LICENSE("GPL");