diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-04-08 21:36:54 +0200 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-04-08 21:36:54 +0200 |
commit | 0b824f8dad9fdfc7c1bf9c1d3ac744075eb73ec6 (patch) | |
tree | 7559859702f2fa02f6a4db64cf10f6c2e3f80c21 /net/9p/trans_virtio.c | |
parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) | |
parent | 3d5a96582303e28c48699f3faaf920ef7d43e6f2 (diff) | |
download | op-kernel-dev-0b824f8dad9fdfc7c1bf9c1d3ac744075eb73ec6.zip op-kernel-dev-0b824f8dad9fdfc7c1bf9c1d3ac744075eb73ec6.tar.gz |
Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into sunxi/core-for-3.10
Diffstat (limited to 'net/9p/trans_virtio.c')
-rw-r--r-- | net/9p/trans_virtio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 74dea37..de2e950 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -655,7 +655,7 @@ static struct p9_trans_module p9_virtio_trans = { .create = p9_virtio_create, .close = p9_virtio_close, .request = p9_virtio_request, - //.zc_request = p9_virtio_zc_request, + .zc_request = p9_virtio_zc_request, .cancel = p9_virtio_cancel, /* * We leave one entry for input and one entry for response |