diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /drivers/vhost/net.c | |
| parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
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 | }; |