diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /drivers/input/misc/pwm-beeper.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/misc/pwm-beeper.c')
| -rw-r--r-- | drivers/input/misc/pwm-beeper.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c index 57c294f07198..fc84c8a51147 100644 --- a/drivers/input/misc/pwm-beeper.c +++ b/drivers/input/misc/pwm-beeper.c | |||
| @@ -180,18 +180,7 @@ static struct platform_driver pwm_beeper_driver = { | |||
| 180 | .pm = PWM_BEEPER_PM_OPS, | 180 | .pm = PWM_BEEPER_PM_OPS, |
| 181 | }, | 181 | }, |
| 182 | }; | 182 | }; |
| 183 | 183 | module_platform_driver(pwm_beeper_driver); | |
| 184 | static int __init pwm_beeper_init(void) | ||
| 185 | { | ||
| 186 | return platform_driver_register(&pwm_beeper_driver); | ||
| 187 | } | ||
| 188 | module_init(pwm_beeper_init); | ||
| 189 | |||
| 190 | static void __exit pwm_beeper_exit(void) | ||
| 191 | { | ||
| 192 | platform_driver_unregister(&pwm_beeper_driver); | ||
| 193 | } | ||
| 194 | module_exit(pwm_beeper_exit); | ||
| 195 | 184 | ||
| 196 | MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>"); | 185 | MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>"); |
| 197 | MODULE_DESCRIPTION("PWM beeper driver"); | 186 | MODULE_DESCRIPTION("PWM beeper driver"); |