rk29: ipp: fix section mismatch warning and include slab.h
author黄涛 <huangtao@rock-chips.com>
Fri, 29 Jul 2011 01:51:59 +0000 (09:51 +0800)
committer黄涛 <huangtao@rock-chips.com>
Fri, 29 Jul 2011 01:53:13 +0000 (09:53 +0800)
drivers/staging/rk29/ipp/rk29-ipp.c

index 5c30ada5bed31732791525700bc607d3c30a60a0..b0865cd94a4e711da7d5ef5addbf83ae66689fb4 100755 (executable)
@@ -41,6 +41,7 @@
 #include <mach/rk29-ipp.h>\r
 #include <linux/time.h>\r
 #include <asm/cacheflush.h>\r
+#include <linux/slab.h>\r
 \r
 //#define IPP_TEST\r
 #ifdef IPP_TEST\r
@@ -1509,7 +1510,7 @@ static struct miscdevice ipp_dev ={
     .fops  = &ipp_fops,\r
 };\r
 \r
-static int __init ipp_drv_probe(struct platform_device *pdev)\r
+static int __devinit ipp_drv_probe(struct platform_device *pdev)\r
 {\r
        struct ipp_drvdata *data;\r
        int ret = 0;\r
@@ -1665,7 +1666,7 @@ err_clock:
        return ret;\r
 }\r
 \r
-static int ipp_drv_remove(struct platform_device *pdev)\r
+static int __devexit ipp_drv_remove(struct platform_device *pdev)\r
 {\r
        struct ipp_drvdata *data = platform_get_drvdata(pdev);\r
     DBG("%s [%d]\n",__FUNCTION__,__LINE__);\r
@@ -1716,7 +1717,7 @@ static int ipp_drv_remove(struct platform_device *pdev)
 \r
 static struct platform_driver rk29_ipp_driver = {\r
        .probe          = ipp_drv_probe,\r
-       .remove         = ipp_drv_remove,\r
+       .remove         = __devexit_p(ipp_drv_remove),\r
        .suspend    = ipp_suspend,\r
        .resume     = ipp_resume,\r
        .driver         = {\r