diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 18:44:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 18:44:52 -0800 |
| commit | 2c0076d8c7eb1dafa03d0a792444862080b34106 (patch) | |
| tree | 93e1b6194b05b3c1c5c30ddece52484f48a61229 /drivers/xen/Makefile | |
| parent | 50de1dd967d4ba3b8a90ebe7a4f5feca24191317 (diff) | |
| parent | e528db5b392ab2a624258a667fed0e65af6e411b (diff) | |
| download | kernel_samsung_smdk4412-2c0076d8c7eb1dafa03d0a792444862080b34106.zip kernel_samsung_smdk4412-2c0076d8c7eb1dafa03d0a792444862080b34106.tar.gz kernel_samsung_smdk4412-2c0076d8c7eb1dafa03d0a792444862080b34106.tar.bz2 | |
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/Makefile')
| -rw-r--r-- | drivers/xen/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 533a199..f81819b 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -11,9 +11,10 @@ obj-$(CONFIG_XEN_BALLOON) += balloon.o obj-$(CONFIG_XEN_DEV_EVTCHN) += xen-evtchn.o obj-$(CONFIG_XENFS) += xenfs/ obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o -obj-$(CONFIG_XEN_PLATFORM_PCI) += platform-pci.o +obj-$(CONFIG_XEN_PLATFORM_PCI) += xen-platform-pci.o obj-$(CONFIG_SWIOTLB_XEN) += swiotlb-xen.o obj-$(CONFIG_XEN_DOM0) += pci.o xen-evtchn-y := evtchn.o +xen-platform-pci-y := platform-pci.o |