From 589b383f026319dff120dbabecdd07ad6e760c47 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Fri, 7 Dec 2012 09:26:20 -0500
Subject: [PATCH] --- yaml --- r: 342977 b: refs/heads/master c:
 05c4c6f7072cff531c62322e07a156b1501df7a5 h: refs/heads/master i:   342975:
 2e16b64eb46647b99eb25992c40140c4b407e3b8 v: v3

---
 [refs]                           | 2 +-
 trunk/sound/soc/codecs/twl4030.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index be8c95492240..d2d4d5e231b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd479f6f5f5dc2a54bc2cc658c310ed8ad2228a9
+refs/heads/master: 05c4c6f7072cff531c62322e07a156b1501df7a5
diff --git a/trunk/sound/soc/codecs/twl4030.c b/trunk/sound/soc/codecs/twl4030.c
index e7f608996c41..63b280b06035 100644
--- a/trunk/sound/soc/codecs/twl4030.c
+++ b/trunk/sound/soc/codecs/twl4030.c
@@ -2334,13 +2334,13 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = {
 	.num_dapm_routes = ARRAY_SIZE(intercon),
 };
 
-static int __devinit twl4030_codec_probe(struct platform_device *pdev)
+static int twl4030_codec_probe(struct platform_device *pdev)
 {
 	return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_twl4030,
 			twl4030_dai, ARRAY_SIZE(twl4030_dai));
 }
 
-static int __devexit twl4030_codec_remove(struct platform_device *pdev)
+static int twl4030_codec_remove(struct platform_device *pdev)
 {
 	snd_soc_unregister_codec(&pdev->dev);
 	return 0;
@@ -2350,7 +2350,7 @@ MODULE_ALIAS("platform:twl4030-codec");
 
 static struct platform_driver twl4030_codec_driver = {
 	.probe		= twl4030_codec_probe,
-	.remove		= __devexit_p(twl4030_codec_remove),
+	.remove		= twl4030_codec_remove,
 	.driver		= {
 		.name	= "twl4030-codec",
 		.owner	= THIS_MODULE,