3 files changed, 4 insertions, 7 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index d42216b52a7b..ac6136001615 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1035,11 +1035,8 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
                 case HDIO_GET_NICE:
                         return put_user(drive->dsc_overlap      <<      IDE_NICE_DSC_OVERLAP    |
                                         drive->atapi_overlap    <<      IDE_NICE_ATAPI_OVERLAP  |
-                                        drive->nice0            <<      IDE_NICE_0              |
-                                        drive->nice1            <<      IDE_NICE_1              |
-                                        drive->nice2            <<      IDE_NICE_2,
+                                        drive->nice1 << IDE_NICE_1,
                                         (long __user *) arg);
-
 #ifdef CONFIG_IDE_TASK_IOCTL
                 case HDIO_DRIVE_TASKFILE:
                         if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h
index ff43f8d6b5b3..3882013d29ea 100644
--- a/include/linux/hdreg.h
+++ b/include/linux/hdreg.h
@@ -706,8 +706,10 @@ struct hd_driveid {
  */
 #define IDE_NICE_DSC_OVERLAP    (0)     /* per the DSC overlap protocol */
 #define IDE_NICE_ATAPI_OVERLAP  (1)     /* not supported yet */
-#define IDE_NICE_0              (2)     /* when sure that it won't affect us */
 #define IDE_NICE_1              (3)     /* when probably won't affect us much */
+#ifndef __KERNEL__
+#define IDE_NICE_0              (2)     /* when sure that it won't affect us */
 #define IDE_NICE_2              (4)     /* when we know it's on our expense */
+#endif
 
 #endif  /* _LINUX_HDREG_H */
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 3b31da892002..4871437a52b2 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -407,8 +407,6 @@ typedef struct ide_drive_s {
         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 nice0          : 1;    /* give obvious excess bandwidth */
-        unsigned nice2          : 1;    /* give a share in our own bandwidth */
         unsigned doorlocking    : 1;    /* for removable only: door lock/unlock works */
         unsigned nodma          : 1;    /* disallow DMA */
         unsigned autotune       : 2;    /* 0=default, 1=autotune, 2=noautotune */