diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 00:12:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 00:12:50 -0400 |
| commit | 69a7aebcf019ab3ff5764525ad6858fbe23bb86d (patch) | |
| tree | 7211df5704b743a7667159748c670a9744164482 /drivers/power | |
| parent | d464c92b5234227c1698862a1906827e2e398ae0 (diff) | |
| parent | f1f996b66cc3908a8f5ffccc2ff41840e92f3b10 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"It's indeed trivial -- mostly documentation updates and a bunch of
typo fixes from Masanari.
There are also several linux/version.h include removals from Jesper."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
kcore: fix spelling in read_kcore() comment
constify struct pci_dev * in obvious cases
Revert "char: Fix typo in viotape.c"
init: fix wording error in mm_init comment
usb: gadget: Kconfig: fix typo for 'different'
Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
writeback: fix typo in the writeback_control comment
Documentation: Fix multiple typo in Documentation
tpm_tis: fix tis_lock with respect to RCU
Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
Doc: Update numastat.txt
qla4xxx: Add missing spaces to error messages
compiler.h: Fix typo
security: struct security_operations kerneldoc fix
Documentation: broken URL in libata.tmpl
Documentation: broken URL in filesystems.tmpl
mtd: simplify return logic in do_map_probe()
mm: fix comment typo of truncate_inode_pages_range
power: bq27x00: Fix typos in comment
...
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/bq27x00_battery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c index 1ed6ea0bad6e..222ccd872ac5 100644 --- a/drivers/power/bq27x00_battery.c +++ b/drivers/power/bq27x00_battery.c | |||
| @@ -47,10 +47,10 @@ | |||
| 47 | #define BQ27x00_REG_TTE 0x16 | 47 | #define BQ27x00_REG_TTE 0x16 |
| 48 | #define BQ27x00_REG_TTF 0x18 | 48 | #define BQ27x00_REG_TTF 0x18 |
| 49 | #define BQ27x00_REG_TTECP 0x26 | 49 | #define BQ27x00_REG_TTECP 0x26 |
| 50 | #define BQ27x00_REG_NAC 0x0C /* Nominal available capaciy */ | 50 | #define BQ27x00_REG_NAC 0x0C /* Nominal available capacity */ |
| 51 | #define BQ27x00_REG_LMD 0x12 /* Last measured discharge */ | 51 | #define BQ27x00_REG_LMD 0x12 /* Last measured discharge */ |
| 52 | #define BQ27x00_REG_CYCT 0x2A /* Cycle count total */ | 52 | #define BQ27x00_REG_CYCT 0x2A /* Cycle count total */ |
| 53 | #define BQ27x00_REG_AE 0x22 /* Available enery */ | 53 | #define BQ27x00_REG_AE 0x22 /* Available energy */ |
| 54 | 54 | ||
| 55 | #define BQ27000_REG_RSOC 0x0B /* Relative State-of-Charge */ | 55 | #define BQ27000_REG_RSOC 0x0B /* Relative State-of-Charge */ |
| 56 | #define BQ27000_REG_ILMD 0x76 /* Initial last measured discharge */ | 56 | #define BQ27000_REG_ILMD 0x76 /* Initial last measured discharge */ |