diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
| commit | d932cb7e630cae3b6b5307b767d296ff1a597c5e (patch) | |
| tree | f930d068a12a256fabef0864bcdf8e85f095369e /include/linux/ide.h | |
| parent | 73b59a3b1c09e4bfc678400b77b96134dcfbf112 (diff) | |
| parent | f5d635f649607b09b0b4620d25d028fd2b1b7ea5 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
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 | ||