---

yaml --- r: 112887 b: refs/heads/master c: ebc6be5 h: refs/heads/master i: 112885: bc2276a 112883: 064fac7 112879: c319575 v: v3
git-mirror · Oct 10, 2008 · 8036499 · 8036499
1 parent 550c3c0
commit 8036499
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af5dfe8cf07b6f4fbd6b7d8ff1aeda718fdd0166
+refs/heads/master: ebc6be520673f65aef188abde43972f9cd2162e9
diff --git a/trunk/drivers/ide/ide.c b/trunk/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/trunk/include/linux/ide.h b/trunk/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 */