diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-05 16:25:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-05 16:25:24 -0500 |
| commit | b13d3c6e8ab6ac53e8c1858a9c837cb6ba3bbef0 (patch) | |
| tree | 4c0b6cba4975b0d7871096e0a99406d450b0272f /include/linux | |
| parent | e213e26ab3988c516c06eba4dcd030ac052f6dc9 (diff) | |
| parent | 5717144a01d701614cfdb15f09ed562d720cf3db (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
fs/9p: Add hardlink support to .u extension
9P2010.L handshake: .L protocol negotiation
9P2010.L handshake: Remove "dotu" variable
9P2010.L handshake: Add mount option
9P2010.L handshake: Add VFS flags
net/9p: Handle mount errors correctly.
net/9p: Remove MAX_9P_CHAN limit
net/9p: Add multi channel support.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/virtio_9p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/virtio_9p.h b/include/linux/virtio_9p.h index 095e10d148b4..332275080083 100644 --- a/include/linux/virtio_9p.h +++ b/include/linux/virtio_9p.h | |||
| @@ -5,7 +5,4 @@ | |||
| 5 | #include <linux/virtio_ids.h> | 5 | #include <linux/virtio_ids.h> |
| 6 | #include <linux/virtio_config.h> | 6 | #include <linux/virtio_config.h> |
| 7 | 7 | ||
| 8 | /* Maximum number of virtio channels per partition (1 for now) */ | ||
| 9 | #define MAX_9P_CHAN 1 | ||
| 10 | |||
| 11 | #endif /* _LINUX_VIRTIO_9P_H */ | 8 | #endif /* _LINUX_VIRTIO_9P_H */ |