diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 02:13:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 02:13:18 -0400 |
| commit | 2c10c22af088ab5d94fae93ce3fe6436b2a208b4 (patch) | |
| tree | db27721001f194327ddbdcd6c983c4ec68b77c00 /include/net/9p/9p.h | |
| parent | f6121f4f8708195e88cbdf8dd8d171b226b3f858 (diff) | |
| parent | fec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'include/net/9p/9p.h')
| -rw-r--r-- | include/net/9p/9p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h index b3d3e27c6299..c3626c0ba9d3 100644 --- a/include/net/9p/9p.h +++ b/include/net/9p/9p.h | |||
| @@ -596,4 +596,5 @@ int p9_idpool_check(int id, struct p9_idpool *p); | |||
| 596 | int p9_error_init(void); | 596 | int p9_error_init(void); |
| 597 | int p9_errstr2errno(char *, int); | 597 | int p9_errstr2errno(char *, int); |
| 598 | int p9_trans_fd_init(void); | 598 | int p9_trans_fd_init(void); |
| 599 | void p9_trans_fd_exit(void); | ||
| 599 | #endif /* NET_9P_H */ | 600 | #endif /* NET_9P_H */ |