diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-10 16:00:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-10 16:00:53 -0700 |
| commit | 7ee32a6d30d1c8a3b7a07a6269da8f0a08662927 (patch) | |
| tree | abcd40a1fee2c28b82ed86a3d0bd2f947af11cfb | |
| parent | Merge tag 'tty-3.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty (diff) | |
| parent | misc/vmw_vmci: Add dependency on CONFIG_NET (diff) | |
| download | linux-dev-7ee32a6d30d1c8a3b7a07a6269da8f0a08662927.tar.xz linux-dev-7ee32a6d30d1c8a3b7a07a6269da8f0a08662927.zip | |
Merge tag 'char-misc-3.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc fix from Greg Kroah-Hartman:
"Here is a single Kconfig dependancy build fix for 3.9.
It's been in linux-next for a while, and fixes a problem that has been
reported multiple times."
* tag 'char-misc-3.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
misc/vmw_vmci: Add dependency on CONFIG_NET
| -rw-r--r-- | drivers/misc/vmw_vmci/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/vmw_vmci/Kconfig b/drivers/misc/vmw_vmci/Kconfig index 39c2ecadb273..ea98f7e9ccd1 100644 --- a/drivers/misc/vmw_vmci/Kconfig +++ b/drivers/misc/vmw_vmci/Kconfig @@ -4,7 +4,7 @@ config VMWARE_VMCI tristate "VMware VMCI Driver" - depends on X86 && PCI + depends on X86 && PCI && NET help This is VMware's Virtual Machine Communication Interface. It enables high-speed communication between host and guest in a virtual |