Merge branch 'stable/platform-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

* '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.

diff --combined drivers/xen/Kconfig
index 5a48ce996dea21558856a3fe8f024c9be1aa352e,6f52b31898038ae6b7b8da12767e2d1b6bfb4b18..464d8935ad4e5faa53f187998635a724597a34cb
--- 1/drivers/xen/Kconfig
--- 2/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -29,14 -29,6 +29,14 @@@ config XEN_DEV_EVTCH
          firing.
          If in doubt, say yes.
  
 +config XEN_BACKEND
 +      bool "Backend driver support"
 +      depends on XEN_DOM0
 +      default y
 +      help
 +        Support for backend device drivers that provide I/O services
 +        to other virtual machines.
 +
  config XENFS
        tristate "Xen filesystem"
        default y
@@@ -70,12 -62,9 +70,12 @@@ config XEN_SYS_HYPERVISO
         virtual environment, /sys/hypervisor will still be present,
         but will have no xen contents.
  
 +config XEN_XENBUS_FRONTEND
 +       tristate
 +
  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