diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-03-05 18:32:58 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-03-05 18:32:58 +0100 |
| commit | 05e5bd0f3daddb0368a433af5b58be68c62dc365 (patch) | |
| tree | a54c90523b72fb6e61b7bfe01fb8917e16825781 /drivers/power/da9030_battery.c | |
| parent | ath6kl: Restrict memcpy to bounce buffer only for write request (diff) | |
| parent | carl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly" (diff) | |
| download | linux-05e5bd0f3daddb0368a433af5b58be68c62dc365.tar.xz linux-05e5bd0f3daddb0368a433af5b58be68c62dc365.zip | |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts:
drivers/net/wireless/ath/ath6kl/cfg80211.c
Diffstat (limited to 'drivers/power/da9030_battery.c')
| -rw-r--r-- | drivers/power/da9030_battery.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/power/da9030_battery.c b/drivers/power/da9030_battery.c index d2c793cf6765..3fd3e95d2b85 100644 --- a/drivers/power/da9030_battery.c +++ b/drivers/power/da9030_battery.c @@ -588,18 +588,7 @@ static struct platform_driver da903x_battery_driver = { .remove = da9030_battery_remove, }; -static int da903x_battery_init(void) -{ - return platform_driver_register(&da903x_battery_driver); -} - -static void da903x_battery_exit(void) -{ - platform_driver_unregister(&da903x_battery_driver); -} - -module_init(da903x_battery_init); -module_exit(da903x_battery_exit); +module_platform_driver(da903x_battery_driver); MODULE_DESCRIPTION("DA9030 battery charger driver"); MODULE_AUTHOR("Mike Rapoport, CompuLab"); |