Merge tag 'drm-misc-fixes-2020-02-07' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-microblaze.git] / arch / m68k / kernel / bootinfo_proc.c

diff --git a/arch/m68k/kernel/bootinfo_proc.c b/arch/m68k/kernel/bootinfo_proc.c
index 3b9cab8..857fa2a 100644 (file)
--- a/arch/m68k/kernel/bootinfo_proc.c
+++ b/arch/m68k/kernel/bootinfo_proc.c
@@ -26,9 +26,9 @@ static ssize_t bootinfo_read(struct file *file, char __user *buf,
                                       bootinfo_size);
 }
 
-static const struct file_operations bootinfo_fops = {
-       .read = bootinfo_read,
-       .llseek = default_llseek,
+static const struct proc_ops bootinfo_proc_ops = {
+       .proc_read      = bootinfo_read,
+       .proc_lseek     = default_llseek,
 };
 
 void __init save_bootinfo(const struct bi_record *bi)
@@ -67,7 +67,7 @@ static int __init init_bootinfo_procfs(void)
        if (!bootinfo_copy)
                return -ENOMEM;
 
-       pde = proc_create_data("bootinfo", 0400, NULL, &bootinfo_fops, NULL);
+       pde = proc_create_data("bootinfo", 0400, NULL, &bootinfo_proc_ops, NULL);
        if (!pde) {
                kfree(bootinfo_copy);
                return -ENOMEM;