diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 19:07:22 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 19:07:22 +0100 |
commit | 1543966a079fc7065849ae43ca4dd767c188ad55 (patch) | |
tree | 760ddb82836a4e3edf314227c731d5dc181d11a7 /include/linux/wm97xx_batt.h | |
parent | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (diff) | |
parent | 4e9687d9c843dc34d368358a36f5f1610e4fbab3 (diff) | |
download | talos-op-linux-1543966a079fc7065849ae43ca4dd767c188ad55.tar.gz talos-op-linux-1543966a079fc7065849ae43ca4dd767c188ad55.zip |
Merge branch 'pxa-palm' into pxa-machines
Conflicts:
drivers/mfd/Kconfig
drivers/pcmcia/Makefile
Diffstat (limited to 'include/linux/wm97xx_batt.h')
-rw-r--r-- | include/linux/wm97xx_batt.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/include/linux/wm97xx_batt.h b/include/linux/wm97xx_batt.h new file mode 100644 index 000000000000..9681d1ab0e4f --- /dev/null +++ b/include/linux/wm97xx_batt.h @@ -0,0 +1,26 @@ +#ifndef _LINUX_WM97XX_BAT_H +#define _LINUX_WM97XX_BAT_H + +#include <linux/wm97xx.h> + +struct wm97xx_batt_info { + int batt_aux; + int temp_aux; + int charge_gpio; + int min_voltage; + int max_voltage; + int batt_div; + int batt_mult; + int temp_div; + int temp_mult; + int batt_tech; + char *batt_name; +}; + +#ifdef CONFIG_BATTERY_WM97XX +void __init wm97xx_bat_set_pdata(struct wm97xx_batt_info *data); +#else +static inline void wm97xx_bat_set_pdata(struct wm97xx_batt_info *data) {} +#endif + +#endif |