diff --git a/[refs] b/[refs]
index 631dcdc7d19b..c35af1d66916 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c75ea1e582d12120072cae742a0d63ea8ac8c65
+refs/heads/master: 5519d00e6a5d99a163484722ef7cea8bff47bc58
diff --git a/trunk/drivers/power/olpc_battery.c b/trunk/drivers/power/olpc_battery.c
index 46a2f07edab1..dc60f61a3b9e 100644
--- a/trunk/drivers/power/olpc_battery.c
+++ b/trunk/drivers/power/olpc_battery.c
@@ -627,7 +627,7 @@ static const struct of_device_id olpc_battery_ids[] __devinitconst = {
 };
 MODULE_DEVICE_TABLE(of, olpc_battery_ids);
 
-static struct platform_driver olpc_battery_drv = {
+static struct platform_driver olpc_battery_driver = {
 	.driver = {
 		.name = "olpc-battery",
 		.owner = THIS_MODULE,
@@ -640,13 +640,13 @@ static struct platform_driver olpc_battery_drv = {
 
 static int __init olpc_bat_init(void)
 {
-	return platform_driver_register(&olpc_battery_drv);
+	return platform_driver_register(&olpc_battery_driver);
 }
 module_init(olpc_bat_init);
 
 static void __exit olpc_bat_exit(void)
 {
-	platform_driver_unregister(&olpc_battery_drv);
+	platform_driver_unregister(&olpc_battery_driver);
 }
 module_exit(olpc_bat_exit);