summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-10 16:00:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-10 16:00:53 -0700
commit7ee32a6d30d1c8a3b7a07a6269da8f0a08662927 (patch)
treeabcd40a1fee2c28b82ed86a3d0bd2f947af11cfb
parent7a92bc3856ec7e995ea9a0fb48c25e79ad395ea3 (diff)
parent6d4f0139d642c45411a47879325891ce2a7c164a (diff)
downloadlinux-3.10-7ee32a6d30d1c8a3b7a07a6269da8f0a08662927.tar.gz
linux-3.10-7ee32a6d30d1c8a3b7a07a6269da8f0a08662927.tar.bz2
linux-3.10-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/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/vmw_vmci/Kconfig b/drivers/misc/vmw_vmci/Kconfig
index 39c2ecadb27..ea98f7e9ccd 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