From: 黄涛 <huangtao@rock-chips.com>
Date: Fri, 29 Jul 2011 01:51:59 +0000 (+0800)
Subject: rk29: ipp: fix section mismatch warning and include slab.h
X-Git-Tag: firefly_0821_release~10058
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2b6f4cdec35bd4a2132d7e4eb0e3039035eaeaa7;p=firefly-linux-kernel-4.4.55.git
rk29: ipp: fix section mismatch warning and include slab.h
---
diff --git a/drivers/staging/rk29/ipp/rk29-ipp.c b/drivers/staging/rk29/ipp/rk29-ipp.c
index 5c30ada5bed3..b0865cd94a4e 100755
--- a/drivers/staging/rk29/ipp/rk29-ipp.c
+++ b/drivers/staging/rk29/ipp/rk29-ipp.c
@@ -41,6 +41,7 @@
#include <mach/rk29-ipp.h>
#include <linux/time.h>
#include <asm/cacheflush.h>
+#include <linux/slab.h>
//#define IPP_TEST
#ifdef IPP_TEST
@@ -1509,7 +1510,7 @@ static struct miscdevice ipp_dev ={
.fops = &ipp_fops,
};
-static int __init ipp_drv_probe(struct platform_device *pdev)
+static int __devinit ipp_drv_probe(struct platform_device *pdev)
{
struct ipp_drvdata *data;
int ret = 0;
@@ -1665,7 +1666,7 @@ err_clock:
return ret;
}
-static int ipp_drv_remove(struct platform_device *pdev)
+static int __devexit ipp_drv_remove(struct platform_device *pdev)
{
struct ipp_drvdata *data = platform_get_drvdata(pdev);
DBG("%s [%d]\n",__FUNCTION__,__LINE__);
@@ -1716,7 +1717,7 @@ static int ipp_drv_remove(struct platform_device *pdev)
static struct platform_driver rk29_ipp_driver = {
.probe = ipp_drv_probe,
- .remove = ipp_drv_remove,
+ .remove = __devexit_p(ipp_drv_remove),
.suspend = ipp_suspend,
.resume = ipp_resume,
.driver = {