diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-03-01 13:24:22 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-03-01 13:26:51 +0100 |
| commit | 89d4a1753b6632327f18d6c8e0842b366b736621 (patch) | |
| tree | eb74be7a995d5b5b3f29f5c6794736a514109d80 /drivers/power/charger-manager.c | |
| parent | 7eca30aef7961e68ad74c0ef920546c2be7f6579 (diff) | |
| parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
Merge branch 'irqdomain/next' of git://git.secretlab.ca/git/linux-2.6
Diffstat (limited to 'drivers/power/charger-manager.c')
| -rw-r--r-- | drivers/power/charger-manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c index 0378d019efa..88fd9710bda 100644 --- a/drivers/power/charger-manager.c +++ b/drivers/power/charger-manager.c @@ -974,10 +974,11 @@ static int __devexit charger_manager_remove(struct platform_device *pdev) return 0; } -const struct platform_device_id charger_manager_id[] = { +static const struct platform_device_id charger_manager_id[] = { { "charger-manager", 0 }, { }, }; +MODULE_DEVICE_TABLE(platform, charger_manager_id); static int cm_suspend_prepare(struct device *dev) { @@ -1069,4 +1070,3 @@ module_exit(charger_manager_cleanup); MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>"); MODULE_DESCRIPTION("Charger Manager"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("charger-manager"); |