ide: remove read-only ->atapi_overlap field from ide_drive_t

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index eb64e942f58b5e27a13e40529bcde16b40ff06cf..5b3bfc78dcddc841ef79dd4758d73e004636e777 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -585,7 +585,6 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
                        return ide_get_identity_ioctl(drive, cmd, arg);
                case HDIO_GET_NICE:
                        return put_user(drive->dsc_overlap      <<      IDE_NICE_DSC_OVERLAP    |
-                                       drive->atapi_overlap    <<      IDE_NICE_ATAPI_OVERLAP  |
                                        drive->nice1 << IDE_NICE_1,
                                        (long __user *) arg);
 #ifdef CONFIG_IDE_TASK_IOCTL

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 4444b0884e5dbb4ca2aad16b894481cfe7a4b46c..9cb935f2e7cee28e28b227fc9bfa3f4203ac0f46 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -415,7 +415,6 @@ struct ide_drive_s {
        unsigned forced_geom    : 1;    /* 1 if hdx=c,h,s was given at boot */
        unsigned no_unmask      : 1;    /* disallow setting unmask bit */
        unsigned no_io_32bit    : 1;    /* disallow enabling 32bit I/O */
-       unsigned atapi_overlap  : 1;    /* ATAPI overlap (not supported) */
        unsigned doorlocking    : 1;    /* for removable only: door lock/unlock works */
        unsigned nodma          : 1;    /* disallow DMA */
        unsigned blocked        : 1;    /* 1=powermanagment told us not to do anything, so sleep nicely */