diff options
author | 2009-03-18 13:16:30 +1100 | |
---|---|---|
committer | 2009-03-18 13:16:30 +1100 | |
commit | c71327ad9f925a4ddbf24db80ce66165104c4ed0 (patch) | |
tree | a1560ddfb827d580843d2a32ba19fb0fc85490d8 /include/linux/ide.h | |
parent | ps3/block: Replace mtd/ps3vram by block/ps3vram (diff) | |
parent | powerpc/mm: Respect _PAGE_COHERENT on classic ppc32 SW (diff) | |
download | wireguard-linux-c71327ad9f925a4ddbf24db80ce66165104c4ed0.tar.xz wireguard-linux-c71327ad9f925a4ddbf24db80ce66165104c4ed0.zip |
Merge commit 'gcl/merge' into merge
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 e0cedfe9fad4..25087aead657 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -797,6 +797,7 @@ typedef struct hwif_s { struct scatterlist *sg_table; int sg_max_nents; /* Maximum number of entries in it */ int sg_nents; /* Current number of entries in it */ + int orig_sg_nents; int sg_dma_direction; /* dma transfer direction */ /* data phase of the active command (currently only valid for PIO/DMA) */ |