summaryrefslogtreecommitdiffstats
path: root/drivers/xen/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 18:44:52 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 18:44:52 -0800
commit2c0076d8c7eb1dafa03d0a792444862080b34106 (patch)
tree93e1b6194b05b3c1c5c30ddece52484f48a61229 /drivers/xen/Kconfig
parent50de1dd967d4ba3b8a90ebe7a4f5feca24191317 (diff)
parente528db5b392ab2a624258a667fed0e65af6e411b (diff)
downloadop-kernel-dev-2c0076d8c7eb1dafa03d0a792444862080b34106.zip
op-kernel-dev-2c0076d8c7eb1dafa03d0a792444862080b34106.tar.gz
Merge branch 'stable/platform-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/platform-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen-platform: Fix compile errors if CONFIG_PCI is not enabled. xen: rename platform-pci module to xen-platform-pci. xen-platform: use PCI interfaces to request IO and MEM resources.
Diffstat (limited to 'drivers/xen/Kconfig')
-rw-r--r--drivers/xen/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 5a48ce9..464d893 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -75,7 +75,7 @@ config XEN_XENBUS_FRONTEND
config XEN_PLATFORM_PCI
tristate "xen platform pci device driver"
- depends on XEN_PVHVM
+ depends on XEN_PVHVM && PCI
default m
help
Driver for the Xen PCI Platform device: it is responsible for
OpenPOWER on IntegriCloud