From 8d62246410ffc9e218b9dcab5e4a45a256cf06c0 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:21:32 -0500
Subject: [PATCH] --- yaml --- r: 338105 b: refs/heads/master c:
 c8ddc220177c9b0aa3207f872ef3401c16da9d6d h: refs/heads/master i:   338103:
 8c8c2666797bbf478052123da66775e23b5ceb8b v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/olpc_dcon/olpc_dcon.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 10d142b94790..7b77df669d60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c4ae9d21867ec2b771085898682ab3db46341c0
+refs/heads/master: c8ddc220177c9b0aa3207f872ef3401c16da9d6d
diff --git a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c
index 3fe209ca38cb..54ed6f69e3d4 100644
--- a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -779,7 +779,7 @@ struct i2c_driver dcon_driver = {
 	.class = I2C_CLASS_DDC | I2C_CLASS_HWMON,
 	.id_table = dcon_idtable,
 	.probe = dcon_probe,
-	.remove = __devexit_p(dcon_remove),
+	.remove = dcon_remove,
 	.detect = dcon_detect,
 	.address_list = normal_i2c,
 };