diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/rtc/class.c | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/rtc/class.c')
-rw-r--r-- | drivers/rtc/class.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index be5a6b73e601..565562ba6ac9 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/rtc.h> | 15 | #include <linux/rtc.h> |
16 | #include <linux/kdev_t.h> | 16 | #include <linux/kdev_t.h> |
17 | #include <linux/idr.h> | 17 | #include <linux/idr.h> |
18 | #include <linux/slab.h> | ||
18 | 19 | ||
19 | #include "rtc-core.h" | 20 | #include "rtc-core.h" |
20 | 21 | ||
@@ -226,6 +227,7 @@ static void __exit rtc_exit(void) | |||
226 | { | 227 | { |
227 | rtc_dev_exit(); | 228 | rtc_dev_exit(); |
228 | class_destroy(rtc_class); | 229 | class_destroy(rtc_class); |
230 | idr_destroy(&rtc_idr); | ||
229 | } | 231 | } |
230 | 232 | ||
231 | subsys_initcall(rtc_init); | 233 | subsys_initcall(rtc_init); |