diff options
| author | Ingo Molnar <[email protected]> | 2009-05-11 12:44:27 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2009-05-11 12:44:31 +0000 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /include/net/9p/client.h | |
| parent | x86 gart: reimplement IOMMU_LEAK feature by using DMA_API_DEBUG (diff) | |
| parent | Linux 2.6.30-rc5 (diff) | |
| download | kernel-41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51.tar.gz kernel-41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51.zip | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'include/net/9p/client.h')
| -rw-r--r-- | include/net/9p/client.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/9p/client.h b/include/net/9p/client.h index 4012e07162e5..e26812274b75 100644 --- a/include/net/9p/client.h +++ b/include/net/9p/client.h @@ -98,7 +98,6 @@ enum p9_req_status_t { struct p9_req_t { int status; int t_err; - u16 flush_tag; wait_queue_head_t *wq; struct p9_fcall *tc; struct p9_fcall *rc; |