From d057700afe3bda147c82d737cd7677d0346f16ac Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sun, 2 Oct 2011 16:45:31 +0200 Subject: [PATCH] --- yaml --- r: 264248 b: refs/heads/master c: b5c49d49b9e175fd56cb4b5cf2c4fd972d15e013 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/mcpdm.c | 2 +- trunk/sound/soc/omap/mcpdm.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 59d960d5f610..045728b0db9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21d17dd2a377ba894f26989915eb3c6e427a3656 +refs/heads/master: b5c49d49b9e175fd56cb4b5cf2c4fd972d15e013 diff --git a/trunk/sound/soc/omap/mcpdm.c b/trunk/sound/soc/omap/mcpdm.c index 928f03707451..50e59194ad81 100644 --- a/trunk/sound/soc/omap/mcpdm.c +++ b/trunk/sound/soc/omap/mcpdm.c @@ -449,7 +449,7 @@ int __devinit omap_mcpdm_probe(struct platform_device *pdev) return ret; } -int __devexit omap_mcpdm_remove(struct platform_device *pdev) +int omap_mcpdm_remove(struct platform_device *pdev) { struct omap_mcpdm *mcpdm_ptr = platform_get_drvdata(pdev); diff --git a/trunk/sound/soc/omap/mcpdm.h b/trunk/sound/soc/omap/mcpdm.h index df3e16fb51f3..20c20a8649fe 100644 --- a/trunk/sound/soc/omap/mcpdm.h +++ b/trunk/sound/soc/omap/mcpdm.h @@ -150,4 +150,4 @@ extern int omap_mcpdm_request(void); extern void omap_mcpdm_free(void); extern int omap_mcpdm_set_offset(int offset1, int offset2); int __devinit omap_mcpdm_probe(struct platform_device *pdev); -int __devexit omap_mcpdm_remove(struct platform_device *pdev); +int omap_mcpdm_remove(struct platform_device *pdev);