Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / drivers / block / nbd.c

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 5d23ffad7c77fc31d97ff1d5e3fed081dffe16c3..cc923a5b430c51d11f0cc4fd1b2c32405c72ca6a 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -722,7 +722,7 @@ static int nbd_ioctl(struct block_device *bdev, fmode_t mode,
        return error;
 }
 
-static struct block_device_operations nbd_fops =
+static const struct block_device_operations nbd_fops =
 {
        .owner =        THIS_MODULE,
        .locked_ioctl = nbd_ioctl,