diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/hdreg.h | 4 | ||||
-rw-r--r-- | include/linux/ide.h | 2 |
2 files changed, 3 insertions, 3 deletions
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 { | |||
706 | */ | 706 | */ |
707 | #define IDE_NICE_DSC_OVERLAP (0) /* per the DSC overlap protocol */ | 707 | #define IDE_NICE_DSC_OVERLAP (0) /* per the DSC overlap protocol */ |
708 | #define IDE_NICE_ATAPI_OVERLAP (1) /* not supported yet */ | 708 | #define IDE_NICE_ATAPI_OVERLAP (1) /* not supported yet */ |
709 | #define IDE_NICE_0 (2) /* when sure that it won't affect us */ | ||
710 | #define IDE_NICE_1 (3) /* when probably won't affect us much */ | 709 | #define IDE_NICE_1 (3) /* when probably won't affect us much */ |
710 | #ifndef __KERNEL__ | ||
711 | #define IDE_NICE_0 (2) /* when sure that it won't affect us */ | ||
711 | #define IDE_NICE_2 (4) /* when we know it's on our expense */ | 712 | #define IDE_NICE_2 (4) /* when we know it's on our expense */ |
713 | #endif | ||
712 | 714 | ||
713 | #endif /* _LINUX_HDREG_H */ | 715 | #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 { | |||
407 | unsigned no_unmask : 1; /* disallow setting unmask bit */ | 407 | unsigned no_unmask : 1; /* disallow setting unmask bit */ |
408 | unsigned no_io_32bit : 1; /* disallow enabling 32bit I/O */ | 408 | unsigned no_io_32bit : 1; /* disallow enabling 32bit I/O */ |
409 | unsigned atapi_overlap : 1; /* ATAPI overlap (not supported) */ | 409 | unsigned atapi_overlap : 1; /* ATAPI overlap (not supported) */ |
410 | unsigned nice0 : 1; /* give obvious excess bandwidth */ | ||
411 | unsigned nice2 : 1; /* give a share in our own bandwidth */ | ||
412 | unsigned doorlocking : 1; /* for removable only: door lock/unlock works */ | 410 | unsigned doorlocking : 1; /* for removable only: door lock/unlock works */ |
413 | unsigned nodma : 1; /* disallow DMA */ | 411 | unsigned nodma : 1; /* disallow DMA */ |
414 | unsigned autotune : 2; /* 0=default, 1=autotune, 2=noautotune */ | 412 | unsigned autotune : 2; /* 0=default, 1=autotune, 2=noautotune */ |