summaryrefslogtreecommitdiffstats
path: root/drivers/misc/vmw_vmci/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-05-06 23:38:00 +0200
committerArnd Bergmann <arnd@arndb.de>2013-05-06 23:38:00 +0200
commit4183bef2e093a2f0aab45f2d5fed82b0e02aeacf (patch)
treee84c484db3746a0f3ead0fb7a2bb9e5a42b89e85 /drivers/misc/vmw_vmci/Kconfig
parentARM: dts: add mshc controller node for Exynos4x12 SoCs (diff)
parentMerge tag 'late-exynos-v3-for-v3.10' of git://git.kernel.org/pub/scm/linux/ke... (diff)
downloadlinux-4183bef2e093a2f0aab45f2d5fed82b0e02aeacf.tar.xz
linux-4183bef2e093a2f0aab45f2d5fed82b0e02aeacf.zip
Merge branch 'late/dt' into next/dt2
This is support for the ARM Chromebook, originally scheduled as a "late" pull request. Since it's already late now, we can combine this into the existing next/dt2 branch. * late/dt: ARM: exynos: dts: cros5250: add EC device ARM: dts: Add sbs-battery for exynos5250-snow ARM: dts: Add i2c-arbitrator bus for exynos5250-snow ARM: dts: Add chip-id controller node on Exynos4/5 SoC ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree
Diffstat (limited to 'drivers/misc/vmw_vmci/Kconfig')
-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 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