From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Jan 2011 02:44:52 +0000 (-0800)
Subject: Merge branch 'stable/platform-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2c0076d8c7eb1dafa03d0a792444862080b34106;hp=-c;p=mv-sheeva.git

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

2c0076d8c7eb1dafa03d0a792444862080b34106
diff --combined drivers/xen/Kconfig
index 5a48ce996de,6f52b318980..464d8935ad4
--- a/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