Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / arch / sparc64 / solaris / socksys.c

diff --git a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c
index 89a4757f192f5bee16b90fed7b793ce622bf36c7..c2864447de821d7f52367cf8ef98b9a9caf7f070 100644 (file)
--- a/arch/sparc64/solaris/socksys.c
+++ b/arch/sparc64/solaris/socksys.c
@@ -163,7 +163,7 @@ static unsigned int socksys_poll(struct file * filp, poll_table * wait)
        return mask;
 }
        
-static struct file_operations socksys_fops = {
+static const struct file_operations socksys_fops = {
        .open =         socksys_open,
        .release =      socksys_release,
 };