aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/vhost/net.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-15 01:52:46 -0400
committerDavid S. Miller <davem@davemloft.net>2010-04-15 01:52:46 -0400
commitfea069152614cdeefba4b2bf80afcddb9c217fc8 (patch)
tree97a4ca0c1afabe94b69110409a46347a093cff45 /drivers/vhost/net.c
parent5f6c01819979afbfec7e0b15fe52371b8eed87e8 (diff)
parenta8d3782f9ea7574b8648e69bbb05a0b1d93e437e (diff)
Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'drivers/vhost/net.c')
-rw-r--r--drivers/vhost/net.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 9777583218ff..aa88911c9504 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -642,7 +642,7 @@ static struct miscdevice vhost_net_misc = {
642 &vhost_net_fops, 642 &vhost_net_fops,
643}; 643};
644 644
645int vhost_net_init(void) 645static int vhost_net_init(void)
646{ 646{
647 int r = vhost_init(); 647 int r = vhost_init();
648 if (r) 648 if (r)
@@ -659,7 +659,7 @@ err_init:
659} 659}
660module_init(vhost_net_init); 660module_init(vhost_net_init);
661 661
662void vhost_net_exit(void) 662static void vhost_net_exit(void)
663{ 663{
664 misc_deregister(&vhost_net_misc); 664 misc_deregister(&vhost_net_misc);
665 vhost_cleanup(); 665 vhost_cleanup();