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 /drivers/power/sec_battery_px.c | |
| 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 'drivers/power/sec_battery_px.c')
| -rw-r--r-- | drivers/power/sec_battery_px.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/sec_battery_px.c b/drivers/power/sec_battery_px.c index 0a31772..f039c17 100644 --- a/drivers/power/sec_battery_px.c +++ b/drivers/power/sec_battery_px.c @@ -60,7 +60,7 @@ enum { #define P2_CHARGING_FEATURE_02 /* SMB136 + MAX17042, Cable detect by TA_nCon */ #endif -#if defined(CONFIG_MACH_P4NOTE) +#if defined(CONFIG_MACH_P4NOTE) || defined(CONFIG_MACH_KONA) #define P4_CHARGING_FEATURE_01 /* SMB347 + MAX17042, use TA_nCON */ #endif |