diff --git a/[refs] b/[refs]
index ad61378b0d4c..36e7cb6faf7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ade44ce07c9316351ae321051221c9bad3af3a44
+refs/heads/master: 4d187a88d3ee3be6a1a0b6859eb00f70e1601b5e
diff --git a/trunk/drivers/mtd/ubi/cdev.c b/trunk/drivers/mtd/ubi/cdev.c
index c183be99c6ca..d99935c0f3c6 100644
--- a/trunk/drivers/mtd/ubi/cdev.c
+++ b/trunk/drivers/mtd/ubi/cdev.c
@@ -1025,20 +1025,20 @@ static int ctrl_cdev_ioctl(struct inode *inode, struct file *file,
 }
 
 /* UBI control character device operations */
-struct file_operations ubi_ctrl_cdev_operations = {
+const struct file_operations ubi_ctrl_cdev_operations = {
 	.ioctl = ctrl_cdev_ioctl,
 	.owner = THIS_MODULE,
 };
 
 /* UBI character device operations */
-struct file_operations ubi_cdev_operations = {
+const struct file_operations ubi_cdev_operations = {
 	.owner = THIS_MODULE,
 	.ioctl = ubi_cdev_ioctl,
 	.llseek = no_llseek,
 };
 
 /* UBI volume character device operations */
-struct file_operations ubi_vol_cdev_operations = {
+const struct file_operations ubi_vol_cdev_operations = {
 	.owner   = THIS_MODULE,
 	.open    = vol_cdev_open,
 	.release = vol_cdev_release,
diff --git a/trunk/drivers/mtd/ubi/ubi.h b/trunk/drivers/mtd/ubi/ubi.h
index 4a8ec485c91d..381f0e1d0a74 100644
--- a/trunk/drivers/mtd/ubi/ubi.h
+++ b/trunk/drivers/mtd/ubi/ubi.h
@@ -449,9 +449,9 @@ struct ubi_device {
 };
 
 extern struct kmem_cache *ubi_wl_entry_slab;
-extern struct file_operations ubi_ctrl_cdev_operations;
-extern struct file_operations ubi_cdev_operations;
-extern struct file_operations ubi_vol_cdev_operations;
+extern const struct file_operations ubi_ctrl_cdev_operations;
+extern const struct file_operations ubi_cdev_operations;
+extern const struct file_operations ubi_vol_cdev_operations;
 extern struct class *ubi_class;
 extern struct mutex ubi_devices_mutex;