diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-23 02:36:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-23 02:36:20 -0700 |
| commit | bb5a9abac1b34f7be0e050ea6ce08355d3b02d8b (patch) | |
| tree | 6375f201e9c52697e0ba86d9673e30d3d92d9c7a /include/linux | |
| parent | c8fab1b610a781a27932e8217cda711ce79e02da (diff) | |
| parent | ab6a3ee735a93b66bc48ddb36b2c6938e950769c (diff) | |
Merge bk://bart.bkbits.net/ide-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 6bdf3302f4be..590f4ed1069e 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -929,7 +929,6 @@ typedef struct hwif_s { struct scatterlist *sg_table; int sg_nents; /* Current number of entries in it */ int sg_dma_direction; /* dma transfer direction */ - int sg_dma_active; /* is it in use */ /* data phase of the active command (currently only valid for PIO/DMA) */ int data_phase; |