diff options
-rw-r--r-- | drivers/ide/ide.c | 1 | ||||
-rw-r--r-- | include/linux/ide.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index eb64e942f58b..5b3bfc78dcdd 100644 --- 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 | |||
585 | return ide_get_identity_ioctl(drive, cmd, arg); | 585 | return ide_get_identity_ioctl(drive, cmd, arg); |
586 | case HDIO_GET_NICE: | 586 | case HDIO_GET_NICE: |
587 | return put_user(drive->dsc_overlap << IDE_NICE_DSC_OVERLAP | | 587 | return put_user(drive->dsc_overlap << IDE_NICE_DSC_OVERLAP | |
588 | drive->atapi_overlap << IDE_NICE_ATAPI_OVERLAP | | ||
589 | drive->nice1 << IDE_NICE_1, | 588 | drive->nice1 << IDE_NICE_1, |
590 | (long __user *) arg); | 589 | (long __user *) arg); |
591 | #ifdef CONFIG_IDE_TASK_IOCTL | 590 | #ifdef CONFIG_IDE_TASK_IOCTL |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 4444b0884e5d..9cb935f2e7ce 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -415,7 +415,6 @@ struct ide_drive_s { | |||
415 | unsigned forced_geom : 1; /* 1 if hdx=c,h,s was given at boot */ | 415 | unsigned forced_geom : 1; /* 1 if hdx=c,h,s was given at boot */ |
416 | unsigned no_unmask : 1; /* disallow setting unmask bit */ | 416 | unsigned no_unmask : 1; /* disallow setting unmask bit */ |
417 | unsigned no_io_32bit : 1; /* disallow enabling 32bit I/O */ | 417 | unsigned no_io_32bit : 1; /* disallow enabling 32bit I/O */ |
418 | unsigned atapi_overlap : 1; /* ATAPI overlap (not supported) */ | ||
419 | unsigned doorlocking : 1; /* for removable only: door lock/unlock works */ | 418 | unsigned doorlocking : 1; /* for removable only: door lock/unlock works */ |
420 | unsigned nodma : 1; /* disallow DMA */ | 419 | unsigned nodma : 1; /* disallow DMA */ |
421 | unsigned blocked : 1; /* 1=powermanagment told us not to do anything, so sleep nicely */ | 420 | unsigned blocked : 1; /* 1=powermanagment told us not to do anything, so sleep nicely */ |