diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 05:06:58 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 05:06:58 +0300 |
| commit | 488b5ec871191359b9b79262a3d48456dae7ea5f (patch) | |
| tree | af9d1ca5d16e7cd195cf132e7af74222dc00a6f9 /net/9p/fcprint.c | |
| parent | a80a438bd08827d0581fca849f3e4e539a22b39c (diff) | |
| parent | 727674435470537a5e75e5f81f96d5d97de57956 (diff) | |
| download | linux-488b5ec871191359b9b79262a3d48456dae7ea5f.tar.xz | |
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:
9p: fix p9_printfcall export
9p: transport API reorganization
9p: add remove function to trans_virtio
9p: Convert semaphore to spinlock for p9_idpool
9p: fix mmap to be read-only
9p: add support for sticky bit
9p: Fix soft lockup in virtio transport
9p: fix bug in attach-per-user
9p: block-based virtio client
9p: create transport rpc cut-thru
9p: fix bug in p9_clone_stat
Diffstat (limited to 'net/9p/fcprint.c')
| -rw-r--r-- | net/9p/fcprint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/fcprint.c b/net/9p/fcprint.c index b1ae8ec57d54..40244fbd9b0d 100644 --- a/net/9p/fcprint.c +++ b/net/9p/fcprint.c @@ -347,12 +347,12 @@ p9_printfcall(char *buf, int buflen, struct p9_fcall *fc, int extended) return ret; } - #else int p9_printfcall(char *buf, int buflen, struct p9_fcall *fc, int extended) { return 0; } -EXPORT_SYMBOL(p9_printfcall); #endif /* CONFIG_NET_9P_DEBUG */ +EXPORT_SYMBOL(p9_printfcall); + |