---

yaml --- r: 357354 b: refs/heads/master c: 3151d14 h: refs/heads/master v: v3
git-mirror · Jan 11, 2013 · c2ae4f4 · c2ae4f4
1 parent 1638188
commit c2ae4f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 978ae2247fac3b330ecd1095823001d2c08c7efd
+refs/heads/master: 3151d14aa6e983aa36d51a80d0477859f9ba12af
diff --git a/trunk/drivers/media/platform/sh_veu.c b/trunk/drivers/media/platform/sh_veu.c
@@ -1143,7 +1143,7 @@ static irqreturn_t sh_veu_isr(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static int __devinit sh_veu_probe(struct platform_device *pdev)
+static int sh_veu_probe(struct platform_device *pdev)
 {
 	struct sh_veu_dev *veu;
 	struct resource *reg_res;
@@ -1225,7 +1225,7 @@ static int __devinit sh_veu_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit sh_veu_remove(struct platform_device *pdev)
+static int sh_veu_remove(struct platform_device *pdev)
 {
 	struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev);
 	struct sh_veu_dev *veu = container_of(v4l2_dev,
@@ -1241,7 +1241,7 @@ static int __devexit sh_veu_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver __refdata sh_veu_pdrv = {
-	.remove		= __devexit_p(sh_veu_remove),
+	.remove		= sh_veu_remove,
 	.driver		= {
 		.name	= "sh_veu",
 		.owner	= THIS_MODULE,