Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[~andy/linux] / include / linux / s3c_adc_battery.h

diff --git a/include/linux/s3c_adc_battery.h b/include/linux/s3c_adc_battery.h
index fbe58b7e63eb3fd6a6b917f19d63048e6ee818de..99dadbffdd4ff576f08473640608d0e28f57de83 100644 (file)
--- a/include/linux/s3c_adc_battery.h
+++ b/include/linux/s3c_adc_battery.h
@@ -25,6 +25,10 @@ struct s3c_adc_bat_pdata {
        const unsigned int current_channel;
        const unsigned int backup_volt_channel;
 
+       const unsigned int volt_samples;
+       const unsigned int current_samples;
+       const unsigned int backup_volt_samples;
+
        const unsigned int volt_mult;
        const unsigned int current_mult;
        const unsigned int backup_volt_mult;