summaryrefslogtreecommitdiff
path: root/drivers/Kconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-10-25 11:18:11 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-25 11:18:11 +0400
commit43a3beb6da994549ec28a9f31727b997a025f958 (patch)
tree9fea6f7e2abd5ba7ce4d5f725a8ceed0a4e0ab80 /drivers/Kconfig
parentc3b92c8787367a8bb53d57d9789b558f1295cc96 (diff)
parent68cf162a1af23c35db8e3b78659c99196c9882ff (diff)
downloadlinux-43a3beb6da994549ec28a9f31727b997a025f958.tar.xz
Merge branch 'staging-next' into Linux 3.1
This was done to resolve a conflict in the drivers/staging/comedi/drivers/ni_labpc.c file that resolved a build bugfix in Linus's tree with a "better" bugfix that was in the staging-next tree that resolved the issue in a more complete manner. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/Kconfig')
-rw-r--r--drivers/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 95b9e7eefadc..ce3c35f4041c 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -130,4 +130,6 @@ source "drivers/iommu/Kconfig"
source "drivers/virt/Kconfig"
+source "drivers/hv/Kconfig"
+
endmenu