From 1e4ac722eee49a22ba799dd65882330276a7a6d1 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 14 Apr 2012 10:25:03 -0600
Subject: [PATCH] --- yaml --- r: 304015 b: refs/heads/master c:
 2dc60c589ba810b0c746c91f390a6796b4176572 h: refs/heads/master i:   304013:
 5ac13aa9af234ac48c42e1ba78d0f8029e791f42   304011:
 f1ed31db7f2dca07a6da4b097b53407d4b67b15f   304007:
 9ed6a3b285f650881e5653a16e072b365a0fb8e0   303999:
 fb42631da2f1238bb981b5dabf68a2340dc265a9 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/misc/bh1780gli.c | 2 +-
 trunk/drivers/misc/pti.c       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 070879f426e3..b80378a656ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d24bd17138beb25effadf99f99b95507772ecb3
+refs/heads/master: 2dc60c589ba810b0c746c91f390a6796b4176572
diff --git a/trunk/drivers/misc/bh1780gli.c b/trunk/drivers/misc/bh1780gli.c
index 54f6f39f990a..f1f9877f3fdf 100644
--- a/trunk/drivers/misc/bh1780gli.c
+++ b/trunk/drivers/misc/bh1780gli.c
@@ -248,7 +248,7 @@ static const struct i2c_device_id bh1780_id[] = {
 
 static struct i2c_driver bh1780_driver = {
 	.probe		= bh1780_probe,
-	.remove		= bh1780_remove,
+	.remove		= __devexit_p(bh1780_remove),
 	.id_table	= bh1780_id,
 	.driver = {
 		.name = "bh1780",
diff --git a/trunk/drivers/misc/pti.c b/trunk/drivers/misc/pti.c
index 383133b201a1..b7eb545394b1 100644
--- a/trunk/drivers/misc/pti.c
+++ b/trunk/drivers/misc/pti.c
@@ -888,7 +888,7 @@ static struct pci_driver pti_pci_driver = {
 	.name		= PCINAME,
 	.id_table	= pci_ids,
 	.probe		= pti_pci_probe,
-	.remove		= pti_pci_remove,
+	.remove		= __devexit_p(pti_pci_remove),
 };
 
 /**