diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
| commit | d14b7a419a664cd7c1c585c9e7fffee9e9051d53 (patch) | |
| tree | 42a1d5b61b58fa0a75252b082c4c6cef6fa9fd8d /drivers/power | |
| parent | e8ff13b0bf88b5e696323a1eec877783d965b3c6 (diff) | |
| parent | a58b3a4aba2fd5c445d9deccc73192bff48b591d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Trivial updates all over the place as usual."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
Fix typo in include/linux/clk.h .
pci: hotplug: Fix typo in pci
iommu: Fix typo in iommu
video: Fix typo in drivers/video
Documentation: Add newline at end-of-file to files lacking one
arm,unicore32: Remove obsolete "select MISC_DEVICES"
module.c: spelling s/postition/position/g
cpufreq: Fix typo in cpufreq driver
trivial: typo in comment in mksysmap
mach-omap2: Fix typo in debug message and comment
scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
Change email address for Steve Glendinning
Btrfs: fix typo in convert_extent_bit
via: Remove bogus if check
netprio_cgroup.c: fix comment typo
backlight: fix memory leak on obscure error path
Documentation: asus-laptop.txt references an obsolete Kconfig item
Documentation: ManagementStyle: fixed typo
mm/vmscan: cleanup comment error in balance_pgdat
mm: cleanup on the comments of zone_reclaim_stat
...
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 70b4a979a6ff..aa764ecc4e60 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
| @@ -301,7 +301,7 @@ config AB8500_BM | |||
| 301 | bool "AB8500 Battery Management Driver" | 301 | bool "AB8500 Battery Management Driver" |
| 302 | depends on AB8500_CORE && AB8500_GPADC | 302 | depends on AB8500_CORE && AB8500_GPADC |
| 303 | help | 303 | help |
| 304 | Say Y to include support for AB5500 battery management. | 304 | Say Y to include support for AB8500 battery management. |
| 305 | 305 | ||
| 306 | config AB8500_BATTERY_THERM_ON_BATCTRL | 306 | config AB8500_BATTERY_THERM_ON_BATCTRL |
| 307 | bool "Thermistor connected on BATCTRL ADC" | 307 | bool "Thermistor connected on BATCTRL ADC" |