2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 0959edf2afdb..ab0c637f58be 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -514,10 +514,10 @@ static int gdrom_bdops_ioctl(struct inode *inode, struct file *file,
 
 static struct block_device_operations gdrom_bdops = {
         .owner                  = THIS_MODULE,
-        .open                   = gdrom_bdops_open,
-        .release                = gdrom_bdops_release,
+        .__open                 = gdrom_bdops_open,
+        .__release              = gdrom_bdops_release,
         .media_changed          = gdrom_bdops_mediachanged,
-        .ioctl                  = gdrom_bdops_ioctl,
+        .__ioctl                        = gdrom_bdops_ioctl,
 };
 
 static irqreturn_t gdrom_command_interrupt(int irq, void *dev_id)
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index abc4079c3f41..57c2dced3e9d 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -180,9 +180,9 @@ static int viocd_blk_media_changed(struct gendisk *disk)
 
 struct block_device_operations viocd_fops = {
         .owner =                THIS_MODULE,
-        .open =                 viocd_blk_open,
-        .release =              viocd_blk_release,
-        .ioctl =                viocd_blk_ioctl,
+        .__open =                       viocd_blk_open,
+        .__release =            viocd_blk_release,
+        .__ioctl =              viocd_blk_ioctl,
         .media_changed =        viocd_blk_media_changed,
 };