Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0

diff --git a/drivers/power/rk30_factory_adc_battery.c b/drivers/power/rk30_factory_adc_battery.c
index 02396a374fc1dd5d02c96e83016197e26e0e016f..04527ec710508369e9102d8aa51a82648e7a3826 100644 (file)
--- a/drivers/power/rk30_factory_adc_battery.c
+++ b/drivers/power/rk30_factory_adc_battery.c
@@ -249,7 +249,7 @@ static ssize_t bat_param_read(struct device *dev,struct device_attribute *attr,
 #endif
        return 0;
 }
-DEVICE_ATTR(batparam, 0777, bat_param_read,NULL);
+DEVICE_ATTR(batparam, 0664, bat_param_read,NULL);
 
 
 static ssize_t rkbatt_show_debug_attrs(struct device *dev,