diff --git a/[refs] b/[refs]
index 584c2ced2a51..11376454da46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64298919ad034aa07a6ec85b82e5c8861e364ae5
+refs/heads/master: e02983cffc5e65069edee9892672e0aef9d9e2cd
diff --git a/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c b/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c
index 16f1f785c0b9..e3d1887e5be4 100644
--- a/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c
+++ b/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c
@@ -784,7 +784,7 @@ tpm_st33_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)
 		clear_bit(0, &chip->is_open);
  * @return: 0 in case of success.
  */
-static __devexit int tpm_st33_i2c_remove(struct i2c_client *client)
+static int tpm_st33_i2c_remove(struct i2c_client *client)
 {
 	struct tpm_chip *chip = (struct tpm_chip *)i2c_get_clientdata(client);
 	struct st33zp24_platform_data *pin_infos =