Merge branch 'for-rmk' of git://git.android.com/kernel into devel

[linux-2.6-omap-h63xx.git] / drivers / rtc / rtc-proc.c

diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index 3d7f4547c7d41d327981e03f28f71b2cf57792b0..0c6257a034ff07b3dc85e9ce1db3847571c97fc4 100644 (file)
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -74,7 +74,7 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
        seq_printf(seq, "24hr\t\t: yes\n");
 
        if (ops->proc)
-               ops->proc(rtc->class_dev.dev, seq);
+               ops->proc(rtc->dev.parent, seq);
 
        return 0;
 }
@@ -108,12 +108,10 @@ void rtc_proc_add_device(struct rtc_device *rtc)
        if (rtc->id == 0) {
                struct proc_dir_entry *ent;
 
-               ent = create_proc_entry("driver/rtc", 0, NULL);
-               if (ent) {
-                       ent->proc_fops = &rtc_proc_fops;
+               ent = proc_create_data("driver/rtc", 0, NULL,
+                                      &rtc_proc_fops, rtc);
+               if (ent)
                        ent->owner = rtc->owner;
-                       ent->data = rtc;
-               }
        }
 }