diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 21:44:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 21:44:52 -0500 |
| commit | 2c0076d8c7eb1dafa03d0a792444862080b34106 (patch) | |
| tree | 93e1b6194b05b3c1c5c30ddece52484f48a61229 /drivers/xen/Kconfig | |
| parent | 50de1dd967d4ba3b8a90ebe7a4f5feca24191317 (diff) | |
| parent | e528db5b392ab2a624258a667fed0e65af6e411b (diff) | |
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/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 5a48ce996dea..464d8935ad4e 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig | |||
| @@ -75,7 +75,7 @@ config XEN_XENBUS_FRONTEND | |||
| 75 | 75 | ||
| 76 | config XEN_PLATFORM_PCI | 76 | config XEN_PLATFORM_PCI |
| 77 | tristate "xen platform pci device driver" | 77 | tristate "xen platform pci device driver" |
| 78 | depends on XEN_PVHVM | 78 | depends on XEN_PVHVM && PCI |
| 79 | default m | 79 | default m |
| 80 | help | 80 | help |
| 81 | Driver for the Xen PCI Platform device: it is responsible for | 81 | Driver for the Xen PCI Platform device: it is responsible for |