Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes

[deliverable/linux.git] / drivers / power / ds2760_battery.c

diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c
index 545874b1df9ebfa4d14bdb2b4b04f07f274cb77e..076e211a40b7111e864d591cba0400ff7042b6ad 100644 (file)
--- a/drivers/power/ds2760_battery.c
+++ b/drivers/power/ds2760_battery.c
@@ -64,7 +64,7 @@ static unsigned int cache_time = 1000;
 module_param(cache_time, uint, 0644);
 MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
 
-static unsigned int pmod_enabled;
+static bool pmod_enabled;
 module_param(pmod_enabled, bool, 0644);
 MODULE_PARM_DESC(pmod_enabled, "PMOD enable bit");