diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-06-16 09:19:36 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-06-16 09:19:36 -0400 |
| commit | 0933a95dfdb1ae5c93e1ede5899f35acc2bb244d (patch) | |
| tree | 55ac47b819a2a2084f82f9d823d9152ac2a7f2b3 /drivers/vhost/net.c | |
| parent | 12420ac341533f3715b3deb788637568f22b78ff (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/vhost/net.c')
| -rw-r--r-- | drivers/vhost/net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 0f41c9195e9b..df5b6b971f26 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c | |||
| @@ -637,7 +637,7 @@ const static struct file_operations vhost_net_fops = { | |||
| 637 | }; | 637 | }; |
| 638 | 638 | ||
| 639 | static struct miscdevice vhost_net_misc = { | 639 | static struct miscdevice vhost_net_misc = { |
| 640 | VHOST_NET_MINOR, | 640 | MISC_DYNAMIC_MINOR, |
| 641 | "vhost-net", | 641 | "vhost-net", |
| 642 | &vhost_net_fops, | 642 | &vhost_net_fops, |
| 643 | }; | 643 | }; |