diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 03:49:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 03:49:55 -0800 |
| commit | 467388f29fc9cebfb70e7a187107b6b5d772cb44 (patch) | |
| tree | 4e6fffa65f38addffc149a5fe88be3d2161eaf6e /drivers/power/pcf50633-charger.c | |
| parent | 028e1415a78733fcd2cba4b4c001826cc37a373e (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
| download | kernel-crypto-467388f29fc9cebfb70e7a187107b6b5d772cb44.tar.gz kernel-crypto-467388f29fc9cebfb70e7a187107b6b5d772cb44.tar.xz kernel-crypto-467388f29fc9cebfb70e7a187107b6b5d772cb44.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/power/pcf50633-charger.c')
| -rw-r--r-- | drivers/power/pcf50633-charger.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c index e988ec130fc..41aec2acbb9 100644 --- a/drivers/power/pcf50633-charger.c +++ b/drivers/power/pcf50633-charger.c @@ -199,7 +199,8 @@ static int adapter_get_property(struct power_supply *psy, enum power_supply_property psp, union power_supply_propval *val) { - struct pcf50633_mbc *mbc = container_of(psy, struct pcf50633_mbc, usb); + struct pcf50633_mbc *mbc = container_of(psy, + struct pcf50633_mbc, adapter); int ret = 0; switch (psp) { |