git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-18 03:23:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.infradead.org/battery-2.6

Browse Source 
* git://git.infradead.org/battery-2.6:
  power_supply_sysfs: Handle -ENODATA in a special way
  wm831x_backup: Remove unused variables
  gta02: Set pcf50633 charger_reference_current_ma
  pcf50633: Query charger status directly
  pcf50633: Properly reenable charging when the supply conditions change
  pcf50633: Get rid of charging restart software auto-triggering
  pcf50633: introduces battery charging current control
  pcf50633: Add ac power supply class to the charger
  wm831x: Factor out WM831x backup battery charger
This commit is contained in:
Linus Torvalds
2009-12-15 08:59:33 -08:00
parent 7f6cd5408a 9d233e8bb9
commit 48e902f0a3
10 changed files with 420 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mfd/wm831x-core.c
View File

@@ -808,6 +808,9 @@ static struct resource wm831x_wdt_resources[] = {
};
static struct mfd_cell wm8310_devs[] = {
{
.name = "wm831x-backup",
},
{
.name = "wm831x-buckv",
.id = 1,
@@ -961,6 +964,9 @@ static struct mfd_cell wm8310_devs[] = {
};
static struct mfd_cell wm8311_devs[] = {
{
.name = "wm831x-backup",
},
{
.name = "wm831x-buckv",
.id = 1,
@@ -1095,6 +1101,9 @@ static struct mfd_cell wm8311_devs[] = {
};
static struct mfd_cell wm8312_devs[] = {
{
.name = "wm831x-backup",
},
{
.name = "wm831x-buckv",
.id = 1,