diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-19 22:17:10 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-19 22:17:10 +1100 |
| commit | e2118d79be17dcb8da6eb4558d3cd6af08fe72b4 (patch) | |
| tree | 94e8267e57f2929522522bb51ed99d72921c95bc /drivers/rtc | |
| parent | fc6d82a54823a7a4bb274a60fa62f8abfb479cc5 (diff) | |
| parent | 8e72f928ffb12ae440ba7d28df326f7e62f934b9 (diff) | |
Merge commit 'proc/proc'
Conflicts:
security/selinux/hooks.c
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-proc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c index 0c6257a034ff..c086fc30a84c 100644 --- a/drivers/rtc/rtc-proc.c +++ b/drivers/rtc/rtc-proc.c @@ -105,14 +105,8 @@ static const struct file_operations rtc_proc_fops = { void rtc_proc_add_device(struct rtc_device *rtc) { - if (rtc->id == 0) { - struct proc_dir_entry *ent; - - ent = proc_create_data("driver/rtc", 0, NULL, - &rtc_proc_fops, rtc); - if (ent) - ent->owner = rtc->owner; - } + if (rtc->id == 0) + proc_create_data("driver/rtc", 0, NULL, &rtc_proc_fops, rtc); } void rtc_proc_del_device(struct rtc_device *rtc) |