diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 04:13:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 04:13:01 -0400 |
| commit | e644dae645e167d154c0526358940986682a72b0 (patch) | |
| tree | 972993c6568085b8d407fc7e13de10f4b93c651d /drivers/rtc/rtc-s35390a.c | |
| parent | 899c612d74d4a242158a4db20367388d6299c028 (diff) | |
| parent | 86809173ce32ef03bd4d0389dfc72df0c805e9c4 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/rtc/rtc-s35390a.c')
| -rw-r--r-- | drivers/rtc/rtc-s35390a.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/rtc/rtc-s35390a.c b/drivers/rtc/rtc-s35390a.c index f789e002c9b0..c9562ceedef3 100644 --- a/drivers/rtc/rtc-s35390a.c +++ b/drivers/rtc/rtc-s35390a.c | |||
| @@ -304,19 +304,8 @@ static struct i2c_driver s35390a_driver = { | |||
| 304 | .id_table = s35390a_id, | 304 | .id_table = s35390a_id, |
| 305 | }; | 305 | }; |
| 306 | 306 | ||
| 307 | static int __init s35390a_rtc_init(void) | 307 | module_i2c_driver(s35390a_driver); |
| 308 | { | ||
| 309 | return i2c_add_driver(&s35390a_driver); | ||
| 310 | } | ||
| 311 | |||
| 312 | static void __exit s35390a_rtc_exit(void) | ||
| 313 | { | ||
| 314 | i2c_del_driver(&s35390a_driver); | ||
| 315 | } | ||
| 316 | 308 | ||
| 317 | MODULE_AUTHOR("Byron Bradley <byron.bbradley@gmail.com>"); | 309 | MODULE_AUTHOR("Byron Bradley <byron.bbradley@gmail.com>"); |
| 318 | MODULE_DESCRIPTION("S35390A RTC driver"); | 310 | MODULE_DESCRIPTION("S35390A RTC driver"); |
| 319 | MODULE_LICENSE("GPL"); | 311 | MODULE_LICENSE("GPL"); |
| 320 | |||
| 321 | module_init(s35390a_rtc_init); | ||
| 322 | module_exit(s35390a_rtc_exit); | ||