diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 19:55:32 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 19:55:32 +0200 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /drivers/power/olpc_battery.c | |
| parent | [CIFS] fix typo (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| download | linux-a815752ac0ffdb910e92958d41d28f4fb28e5296.tar.xz linux-a815752ac0ffdb910e92958d41d28f4fb28e5296.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/power/olpc_battery.c')
| -rw-r--r-- | drivers/power/olpc_battery.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c index af7a231092a4..ab1e8289f07f 100644 --- a/drivers/power/olpc_battery.c +++ b/drivers/power/olpc_battery.c @@ -315,7 +315,6 @@ static int __init olpc_bat_init(void) if (ret) goto battery_failed; - olpc_register_battery_callback(&olpc_battery_trigger_uevent); goto success; battery_failed: @@ -328,7 +327,6 @@ success: static void __exit olpc_bat_exit(void) { - olpc_deregister_battery_callback(); power_supply_unregister(&olpc_bat); power_supply_unregister(&olpc_ac); platform_device_unregister(bat_pdev); |