diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /include/net/9p/client.h | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
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 <mingo@elte.hu>
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 { | |||
| 98 | struct p9_req_t { | 98 | struct p9_req_t { |
| 99 | int status; | 99 | int status; |
| 100 | int t_err; | 100 | int t_err; |
| 101 | u16 flush_tag; | ||
| 102 | wait_queue_head_t *wq; | 101 | wait_queue_head_t *wq; |
| 103 | struct p9_fcall *tc; | 102 | struct p9_fcall *tc; |
| 104 | struct p9_fcall *rc; | 103 | struct p9_fcall *rc; |