git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
[pandora-kernel.git]
/
drivers
/
vhost
/
net.c
diff --git
a/drivers/vhost/net.c
b/drivers/vhost/net.c
index
9777583
..
aa88911
100644
(file)
--- a/
drivers/vhost/net.c
+++ b/
drivers/vhost/net.c
@@
-642,7
+642,7
@@
static struct miscdevice vhost_net_misc = {
&vhost_net_fops,
};
&vhost_net_fops,
};
-int vhost_net_init(void)
+
static
int vhost_net_init(void)
{
int r = vhost_init();
if (r)
{
int r = vhost_init();
if (r)
@@
-659,7
+659,7
@@
err_init:
}
module_init(vhost_net_init);
}
module_init(vhost_net_init);
-void vhost_net_exit(void)
+
static
void vhost_net_exit(void)
{
misc_deregister(&vhost_net_misc);
vhost_cleanup();
{
misc_deregister(&vhost_net_misc);
vhost_cleanup();