diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 01:39:26 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 01:39:26 -0400 |
commit | 5b85f29ca453d56d83cdffa075d615583bb8fb72 (patch) | |
tree | a553754dcef01a22a6bd6e2eeb2fd4eb69bf5b37 /include/linux/ide.h | |
parent | 48cb37bd9e053429aacb7c2726da3300aba60c68 (diff) | |
parent | ab3b3fd38125be0242c2f94bf144b48054210882 (diff) | |
download | kernel-crypto-5b85f29ca453d56d83cdffa075d615583bb8fb72.tar.gz kernel-crypto-5b85f29ca453d56d83cdffa075d615583bb8fb72.tar.xz kernel-crypto-5b85f29ca453d56d83cdffa075d615583bb8fb72.zip |
Merge branch 'upstream-fixes' 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 dc7abef1096..99620451d95 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -571,6 +571,7 @@ typedef struct ide_drive_s { u8 waiting_for_dma; /* dma currently in progress */ u8 unmask; /* okay to unmask other irqs */ u8 bswap; /* byte swap data */ + u8 noflush; /* don't attempt flushes */ u8 dsc_overlap; /* DSC overlap */ u8 nice1; /* give potential excess bandwidth */ |