diff --git a/[refs] b/[refs]
index 37bc531f4eb6..1532ec63511c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4eafca1132d6065c2f37a873dbf4e0bb88cb23f
+refs/heads/master: 2878bda864c53db599c4a3e3b136ed3e2af68ca0
diff --git a/trunk/drivers/extcon/extcon_gpio.c b/trunk/drivers/extcon/extcon_gpio.c
index 5c0f08506f93..fe7a07b47336 100644
--- a/trunk/drivers/extcon/extcon_gpio.c
+++ b/trunk/drivers/extcon/extcon_gpio.c
@@ -153,7 +153,7 @@ static int __devexit gpio_extcon_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static struct platform_driver gpio_extcon = {
+static struct platform_driver gpio_extcon_driver = {
 	.probe		= gpio_extcon_probe,
 	.remove		= __devexit_p(gpio_extcon_remove),
 	.driver		= {
@@ -162,7 +162,7 @@ static struct platform_driver gpio_extcon = {
 	},
 };
 
-module_platform_driver(gpio_extcon);
+module_platform_driver(gpio_extcon_driver);
 
 MODULE_AUTHOR("Mike Lockwood <lockwood@android.com>");
 MODULE_DESCRIPTION("GPIO extcon driver");