diff --git a/[refs] b/[refs]
index 2259eff5f243..44aea9f2fea0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c68d2b1594548cda7f6dbac6a4d9d30a9b01558c
+refs/heads/master: 46c529cf79f6c7b239f83b4997d676dd5b51908c
diff --git a/trunk/drivers/gpio/twl4030-gpio.c b/trunk/drivers/gpio/twl4030-gpio.c
index afad14792141..49384a7c5492 100644
--- a/trunk/drivers/gpio/twl4030-gpio.c
+++ b/trunk/drivers/gpio/twl4030-gpio.c
@@ -460,7 +460,8 @@ static int __devinit gpio_twl4030_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit gpio_twl4030_remove(struct platform_device *pdev)
+/* Cannot use __devexit as gpio_twl4030_probe() calls us */
+static int gpio_twl4030_remove(struct platform_device *pdev)
 {
 	struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;
 	int status;
@@ -493,7 +494,7 @@ static struct platform_driver gpio_twl4030_driver = {
 	.driver.name	= "twl4030_gpio",
 	.driver.owner	= THIS_MODULE,
 	.probe		= gpio_twl4030_probe,
-	.remove		= __devexit_p(gpio_twl4030_remove),
+	.remove		= gpio_twl4030_remove,
 };
 
 static int __init gpio_twl4030_init(void)