Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
index 918ee8934196..64dcc7439c99 100644
--- a/drivers/video/omap/lcd_mipid.c
+++ b/drivers/video/omap/lcd_mipid.c
@@ -20,11 +20,13 @@
  */
 #include <linux/device.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/spi/spi.h>
 
-#include <mach/omapfb.h>
-#include <mach/lcd_mipid.h>
+#include <plat/lcd_mipid.h>
+
+#include "omapfb.h"
 
 #define MIPID_MODULE_NAME               "lcd_mipid"
 
@@ -607,7 +609,7 @@ static struct spi_driver mipid_spi_driver = {
         .remove = __devexit_p(mipid_spi_remove),
 };
 
-static int mipid_drv_init(void)
+static int __init mipid_drv_init(void)
 {
         spi_register_driver(&mipid_spi_driver);
 
@@ -615,7 +617,7 @@ static int mipid_drv_init(void)
 }
 module_init(mipid_drv_init);
 
-static void mipid_drv_cleanup(void)
+static void __exit mipid_drv_cleanup(void)
 {
         spi_unregister_driver(&mipid_spi_driver);
 }