diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:39 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:39 -0400 |
| commit | 02b311bce9fc87987a123adc3e6a2d0a2caa70e2 (patch) | |
| tree | ba5c42ecf98de1a1a72f4bd5d94dc729ca8196c9 /include/linux/ide.h | |
| parent | 8f0f850e240df5bea027caeb1723142c50e37e57 (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index dc7abef10965..99620451d958 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -571,6 +571,7 @@ typedef struct ide_drive_s { | |||
| 571 | u8 waiting_for_dma; /* dma currently in progress */ | 571 | u8 waiting_for_dma; /* dma currently in progress */ |
| 572 | u8 unmask; /* okay to unmask other irqs */ | 572 | u8 unmask; /* okay to unmask other irqs */ |
| 573 | u8 bswap; /* byte swap data */ | 573 | u8 bswap; /* byte swap data */ |
| 574 | u8 noflush; /* don't attempt flushes */ | ||
| 574 | u8 dsc_overlap; /* DSC overlap */ | 575 | u8 dsc_overlap; /* DSC overlap */ |
| 575 | u8 nice1; /* give potential excess bandwidth */ | 576 | u8 nice1; /* give potential excess bandwidth */ |
| 576 | 577 | ||