From 4940a555cb4e8c8d0946048eefe7dddb26ff4fe6 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:20:55 -0500
Subject: [PATCH] --- yaml --- r: 338087 b: refs/heads/master c:
 44b90a3fbcac0f233b71b4041fa76ea325caca33 h: refs/heads/master i:   338085:
 1c332855a53616caf4ee3088649224a8f9ffd23c   338083:
 1249e034afa3cd4979057bbb9a778f3a7a279c0a   338079:
 ec0f1cb8beef777992b4d97fc0eb7e76d613a578 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/nvec/nvec.c       | 2 +-
 trunk/drivers/staging/nvec/nvec_kbd.c   | 2 +-
 trunk/drivers/staging/nvec/nvec_paz00.c | 2 +-
 trunk/drivers/staging/nvec/nvec_power.c | 2 +-
 trunk/drivers/staging/nvec/nvec_ps2.c   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 1eb931f74aa2..c9b81e5cd4a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 477953e13a8b5b49738bb26c3d1f3ffb7ddd8cc6
+refs/heads/master: 44b90a3fbcac0f233b71b4041fa76ea325caca33
diff --git a/trunk/drivers/staging/nvec/nvec.c b/trunk/drivers/staging/nvec/nvec.c
index 094fdc366f30..0258035b4b0e 100644
--- a/trunk/drivers/staging/nvec/nvec.c
+++ b/trunk/drivers/staging/nvec/nvec.c
@@ -909,7 +909,7 @@ MODULE_DEVICE_TABLE(of, nvidia_nvec_of_match);
 
 static struct platform_driver nvec_device_driver = {
 	.probe   = tegra_nvec_probe,
-	.remove  = __devexit_p(tegra_nvec_remove),
+	.remove  = tegra_nvec_remove,
 	.driver  = {
 		.name = "nvec",
 		.owner = THIS_MODULE,
diff --git a/trunk/drivers/staging/nvec/nvec_kbd.c b/trunk/drivers/staging/nvec/nvec_kbd.c
index 6cc30dcd8306..7c8c603da705 100644
--- a/trunk/drivers/staging/nvec/nvec_kbd.c
+++ b/trunk/drivers/staging/nvec/nvec_kbd.c
@@ -169,7 +169,7 @@ static int __devexit nvec_kbd_remove(struct platform_device *pdev)
 
 static struct platform_driver nvec_kbd_driver = {
 	.probe  = nvec_kbd_probe,
-	.remove = __devexit_p(nvec_kbd_remove),
+	.remove = nvec_kbd_remove,
 	.driver = {
 		.name = "nvec-kbd",
 		.owner = THIS_MODULE,
diff --git a/trunk/drivers/staging/nvec/nvec_paz00.c b/trunk/drivers/staging/nvec/nvec_paz00.c
index b747e39ff94d..aab234e97d0b 100644
--- a/trunk/drivers/staging/nvec/nvec_paz00.c
+++ b/trunk/drivers/staging/nvec/nvec_paz00.c
@@ -83,7 +83,7 @@ static int __devexit nvec_paz00_remove(struct platform_device *pdev)
 
 static struct platform_driver nvec_paz00_driver = {
 	.probe  = nvec_paz00_probe,
-	.remove = __devexit_p(nvec_paz00_remove),
+	.remove = nvec_paz00_remove,
 	.driver = {
 		.name  = "nvec-paz00",
 		.owner = THIS_MODULE,
diff --git a/trunk/drivers/staging/nvec/nvec_power.c b/trunk/drivers/staging/nvec/nvec_power.c
index cc8ccd75e7f4..99e06f661c19 100644
--- a/trunk/drivers/staging/nvec/nvec_power.c
+++ b/trunk/drivers/staging/nvec/nvec_power.c
@@ -425,7 +425,7 @@ static int __devexit nvec_power_remove(struct platform_device *pdev)
 
 static struct platform_driver nvec_power_driver = {
 	.probe = nvec_power_probe,
-	.remove = __devexit_p(nvec_power_remove),
+	.remove = nvec_power_remove,
 	.driver = {
 		   .name = "nvec-power",
 		   .owner = THIS_MODULE,
diff --git a/trunk/drivers/staging/nvec/nvec_ps2.c b/trunk/drivers/staging/nvec/nvec_ps2.c
index d7c651102131..6375e80e77af 100644
--- a/trunk/drivers/staging/nvec/nvec_ps2.c
+++ b/trunk/drivers/staging/nvec/nvec_ps2.c
@@ -164,7 +164,7 @@ static const SIMPLE_DEV_PM_OPS(nvec_mouse_pm_ops, nvec_mouse_suspend,
 
 static struct platform_driver nvec_mouse_driver = {
 	.probe  = nvec_mouse_probe,
-	.remove = __devexit_p(nvec_mouse_remove),
+	.remove = nvec_mouse_remove,
 	.driver = {
 		.name = "nvec-mouse",
 		.owner = THIS_MODULE,