From 803649983626f64c1d78ee3bd6f7055ed6e6fea2 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 10 Oct 2008 22:39:29 +0200 Subject: [PATCH] --- yaml --- r: 112887 b: refs/heads/master c: ebc6be520673f65aef188abde43972f9cd2162e9 h: refs/heads/master i: 112885: bc2276a182188de09f3e3acbbc23a6d501c1549d 112883: 064fac71a311966d1062df664f4fd872fb7513e4 112879: c319575f61f510ed9a5f1f5666c4824cec99fb5d v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide.c | 1 - trunk/include/linux/ide.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cf98b0bd2b7c..46607f891ec7 100644 --- 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 index eb64e942f58b..5b3bfc78dcdd 100644 --- 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 index 4444b0884e5d..9cb935f2e7ce 100644 --- 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 */