From 241764fc0f03700293f9c2b609ddad08e12490bb Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 21 Dec 2012 13:02:30 -0800
Subject: [PATCH] --- yaml --- r: 348176 b: refs/heads/master c:
 6dfb6715b58a9d184188188779f9f8f27e558042 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/vlynq/vlynq.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index fa5c23250c8b..90633aa30436 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b92c914d02ad7a77513076515ffe9f26db1fe8af
+refs/heads/master: 6dfb6715b58a9d184188188779f9f8f27e558042
diff --git a/trunk/drivers/vlynq/vlynq.c b/trunk/drivers/vlynq/vlynq.c
index aa250cebecd2..7b07135ab26e 100644
--- a/trunk/drivers/vlynq/vlynq.c
+++ b/trunk/drivers/vlynq/vlynq.c
@@ -772,7 +772,7 @@ static int vlynq_remove(struct platform_device *pdev)
 static struct platform_driver vlynq_platform_driver = {
 	.driver.name = "vlynq",
 	.probe = vlynq_probe,
-	.remove = __devexit_p(vlynq_remove),
+	.remove = vlynq_remove,
 };
 
 struct bus_type vlynq_bus_type = {
@@ -783,7 +783,7 @@ struct bus_type vlynq_bus_type = {
 };
 EXPORT_SYMBOL(vlynq_bus_type);
 
-static int __devinit vlynq_init(void)
+static int vlynq_init(void)
 {
 	int res = 0;
 
@@ -803,7 +803,7 @@ static int __devinit vlynq_init(void)
 	return res;
 }
 
-static void __devexit vlynq_exit(void)
+static void vlynq_exit(void)
 {
 	platform_driver_unregister(&vlynq_platform_driver);
 	bus_unregister(&vlynq_bus_type);