Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / infiniband / hw / ipath / ipath_diag.c

diff --git a/drivers/infiniband/hw/ipath/ipath_diag.c b/drivers/infiniband/hw/ipath/ipath_diag.c
index 28c087b824c2846c7d6e971e59359295618587b0..0f13a2182cc7d1bd0707058dc435f07343b2162f 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_diag.c
+++ b/drivers/infiniband/hw/ipath/ipath_diag.c
@@ -59,7 +59,7 @@ static ssize_t ipath_diag_read(struct file *fp, char __user *data,
 static ssize_t ipath_diag_write(struct file *fp, const char __user *data,
                                size_t count, loff_t *off);
 
-static struct file_operations diag_file_ops = {
+static const struct file_operations diag_file_ops = {
        .owner = THIS_MODULE,
        .write = ipath_diag_write,
        .read = ipath_diag_read,
@@ -71,7 +71,7 @@ static ssize_t ipath_diagpkt_write(struct file *fp,
                                   const char __user *data,
                                   size_t count, loff_t *off);
 
-static struct file_operations diagpkt_file_ops = {
+static const struct file_operations diagpkt_file_ops = {
        .owner = THIS_MODULE,
        .write = ipath_diagpkt_write,
 };