diff --git a/[refs] b/[refs]
index 6f030f1db756..fa9a4a880274 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 063f9f6a8705c5da3ee46c667a3e6e01eaf31560
+refs/heads/master: 1a6a8a8414f740f1dfde762837eeb3f2ce835919
diff --git a/trunk/drivers/staging/nvec/nvec.c b/trunk/drivers/staging/nvec/nvec.c
index d8180f0cd1c7..c59b7b299d37 100644
--- a/trunk/drivers/staging/nvec/nvec.c
+++ b/trunk/drivers/staging/nvec/nvec.c
@@ -853,7 +853,7 @@ static int tegra_nvec_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __devexit tegra_nvec_remove(struct platform_device *pdev)
+static int tegra_nvec_remove(struct platform_device *pdev)
 {
 	struct nvec_chip *nvec = platform_get_drvdata(pdev);
 
diff --git a/trunk/drivers/staging/nvec/nvec_kbd.c b/trunk/drivers/staging/nvec/nvec_kbd.c
index 9048d597cc6b..7cb149bf3d3f 100644
--- a/trunk/drivers/staging/nvec/nvec_kbd.c
+++ b/trunk/drivers/staging/nvec/nvec_kbd.c
@@ -159,7 +159,7 @@ static int nvec_kbd_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit nvec_kbd_remove(struct platform_device *pdev)
+static int nvec_kbd_remove(struct platform_device *pdev)
 {
 	input_unregister_device(keys_dev.input);
 	input_free_device(keys_dev.input);
diff --git a/trunk/drivers/staging/nvec/nvec_paz00.c b/trunk/drivers/staging/nvec/nvec_paz00.c
index 4ac17fb6a0dc..934b796222a2 100644
--- a/trunk/drivers/staging/nvec/nvec_paz00.c
+++ b/trunk/drivers/staging/nvec/nvec_paz00.c
@@ -72,7 +72,7 @@ static int nvec_paz00_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __devexit nvec_paz00_remove(struct platform_device *pdev)
+static int nvec_paz00_remove(struct platform_device *pdev)
 {
 	struct nvec_led *led = platform_get_drvdata(pdev);
 
diff --git a/trunk/drivers/staging/nvec/nvec_power.c b/trunk/drivers/staging/nvec/nvec_power.c
index 6c702ed7463d..b7b6d54f58ec 100644
--- a/trunk/drivers/staging/nvec/nvec_power.c
+++ b/trunk/drivers/staging/nvec/nvec_power.c
@@ -407,7 +407,7 @@ static int nvec_power_probe(struct platform_device *pdev)
 	return power_supply_register(&pdev->dev, psy);
 }
 
-static int __devexit nvec_power_remove(struct platform_device *pdev)
+static int nvec_power_remove(struct platform_device *pdev)
 {
 	struct nvec_power *power = platform_get_drvdata(pdev);
 
diff --git a/trunk/drivers/staging/nvec/nvec_ps2.c b/trunk/drivers/staging/nvec/nvec_ps2.c
index 59d8f5a76360..88dd288bf3d7 100644
--- a/trunk/drivers/staging/nvec/nvec_ps2.c
+++ b/trunk/drivers/staging/nvec/nvec_ps2.c
@@ -123,7 +123,7 @@ static int nvec_mouse_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __devexit nvec_mouse_remove(struct platform_device *pdev)
+static int nvec_mouse_remove(struct platform_device *pdev)
 {
 	serio_unregister_port(ps2_dev.ser_dev);