Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (241 commits)
  [ARM] 5171/1: ep93xx: fix compilation of modules using clocks
  [ARM] 5133/2: at91sam9g20 defconfig file
  [ARM] 5130/4: Support for the at91sam9g20
  [ARM] 5160/1: IOP3XX: gpio/gpiolib support
  [ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits.
  [ARM] 5084/1: zylonite: Register AC97 device
  [ARM] 5085/2: PXA: Move AC97 over to the new central device declaration model
  [ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC drivers
  [ARM] 5147/1: pxaficp_ir: drop pxa_gpio_mode calls, as pin setting
  [ARM] 5145/1: PXA2xx: provide api to control IrDA pins state
  [ARM] 5144/1: pxaficp_ir: cleanup includes
  [ARM] pxa: remove pxa_set_cken()
  [ARM] pxa: allow clk aliases
  [ARM] Feroceon: don't disable BPU on boot
  [ARM] Orion: LED support for HP mv2120
  [ARM] Orion: add RD88F5181L-FXO support
  [ARM] Orion: add RD88F5181L-GE support
  [ARM] Orion: add Netgear WNR854T support
  [ARM] s3c2410_defconfig: update for current build
  [ARM] Acer n30: Minor style and indentation fixes.
  ...

1 files changed, 44 insertions, 0 deletions

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index fafe7db20d6d..d0746261c957 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1792,11 +1792,49 @@ failed:
         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",
         },
 };
@@ -1809,7 +1847,13 @@ static int __init 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");