Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

[mv-sheeva.git] / include / linux / genhd.h

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 109d179adb93c5eaeed6a2b2555361987ec17ea0..297df45ffd0ad27e8219aaf3715a00d030f5bf54 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -151,7 +151,7 @@ struct gendisk {
        struct disk_part_tbl *part_tbl;
        struct hd_struct part0;
 
-       struct block_device_operations *fops;
+       const struct block_device_operations *fops;
        struct request_queue *queue;
        void *private_data;