aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/vhost/net.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-14 22:52:46 -0700
committerDavid S. Miller <davem@davemloft.net>2010-04-14 22:52:46 -0700
commitfea069152614cdeefba4b2bf80afcddb9c217fc8 (patch)
tree97a4ca0c1afabe94b69110409a46347a093cff45 /drivers/vhost/net.c
parentixgbe: fix bug with vlan strip in promsic mode (diff)
parentvhost: fix sparse warnings (diff)
downloadlinux-dev-fea069152614cdeefba4b2bf80afcddb9c217fc8.tar.xz
linux-dev-fea069152614cdeefba4b2bf80afcddb9c217fc8.zip
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 = {
&vhost_net_fops,
};
-int vhost_net_init(void)
+static int vhost_net_init(void)
{
int r = vhost_init();
if (r)
@@ -659,7 +659,7 @@ err_init:
}
module_init(vhost_net_init);
-void vhost_net_exit(void)
+static void vhost_net_exit(void)
{
misc_deregister(&vhost_net_misc);
vhost_cleanup();