diff --git a/[refs] b/[refs]
index d638a776bf0b..56d207d2472d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46b65a8fe63ece3b01d7d0c5e3bb5b9f478c44d5
+refs/heads/master: 706c96b7208b6b4f070b7f5c104ea917c48043f5
diff --git a/trunk/drivers/mfd/88pm80x.c b/trunk/drivers/mfd/88pm80x.c
index 62da342553bd..cd0bf527d764 100644
--- a/trunk/drivers/mfd/88pm80x.c
+++ b/trunk/drivers/mfd/88pm80x.c
@@ -91,7 +91,7 @@ int __devinit pm80x_init(struct i2c_client *client,
 }
 EXPORT_SYMBOL_GPL(pm80x_init);
 
-int __devexit pm80x_deinit(struct i2c_client *client)
+int pm80x_deinit(struct i2c_client *client)
 {
 	struct pm80x_chip *chip = i2c_get_clientdata(client);
 
diff --git a/trunk/include/linux/mfd/88pm80x.h b/trunk/include/linux/mfd/88pm80x.h
index 103f06d1892d..a0ca0dca1244 100644
--- a/trunk/include/linux/mfd/88pm80x.h
+++ b/trunk/include/linux/mfd/88pm80x.h
@@ -365,5 +365,5 @@ static inline int pm80x_dev_resume(struct device *dev)
 
 extern int pm80x_init(struct i2c_client *client,
 			     const struct i2c_device_id *id) __devinit;
-extern int pm80x_deinit(struct i2c_client *client) __devexit;
+extern int pm80x_deinit(struct i2c_client *client);
 #endif /* __LINUX_MFD_88PM80X_H */