diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-22 15:04:56 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-22 15:04:56 +0200 |
| commit | b99374450c03bf5081b88995d91d34fb9b2fd040 (patch) | |
| tree | b6f525d915504ad8bd99bdb2dadcca345a4ad3a3 /include/linux/power_supply.h | |
| parent | a39819e88ea4546218b581d7f061a99ca91d825b (diff) | |
| parent | e2f984e707f517f24041b70018770b20b71cb6a6 (diff) | |
| download | kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.zip kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.tar.gz kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.tar.bz2 | |
Merge remote-tracking branch 'github/cm-11.0'
Conflicts:
firmware/Makefile
firmware/epen/W9001_B713.bin.ihex
firmware/epen/W9001_B746.bin.ihex
firmware/epen/W9001_B746JD.bin.ihex
firmware/epen/W9001_B746L.bin.ihex
firmware/epen/W9001_B746S.bin.ihex
Diffstat (limited to 'include/linux/power_supply.h')
| -rw-r--r-- | include/linux/power_supply.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 529d981..8289fca 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -126,6 +126,11 @@ enum power_supply_property { POWER_SUPPLY_PROP_MODEL_NAME, POWER_SUPPLY_PROP_MANUFACTURER, POWER_SUPPLY_PROP_SERIAL_NUMBER, +#if defined(CONFIG_MACH_KONA) + POWER_SUPPLY_PROP_CHARGING_MODE, + POWER_SUPPLY_PROP_COMPENSATION_1, + POWER_SUPPLY_PROP_COMPENSATION_3, +#endif }; enum power_supply_type { |