Merge branch 'fix/misc' into for-linus

[pandora-kernel.git] / drivers / ide / ide-gd.c

diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index 2141190..c32d839 100644 (file)
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -8,6 +8,7 @@
 #include <linux/ide.h>
 #include <linux/hdreg.h>
 #include <linux/dmi.h>
+#include <linux/slab.h>
 
 #if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT)
 #define IDE_DISK_MINORS                (1 << PARTN_BITS)
@@ -321,7 +322,7 @@ static int ide_gd_ioctl(struct block_device *bdev, fmode_t mode,
        return drive->disk_ops->ioctl(drive, bdev, mode, cmd, arg);
 }
 
-static struct block_device_operations ide_gd_ops = {
+static const struct block_device_operations ide_gd_ops = {
        .owner                  = THIS_MODULE,
        .open                   = ide_gd_open,
        .release                = ide_gd_release,