From 70a3d8d324b9aa4dc130c01029b042d89cda071f Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Thu, 2 Feb 2012 14:59:22 -0500 Subject: [PATCH] Merge conflict resolved. Somehow the letter 's' slipped in the Makefile. This fixes the compile issues. Signed-off-by: Konrad Rzeszutek Wilk --- drivers/xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 917d1886d075..db9ec7274965 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -23,5 +23,5 @@ obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ xen-evtchn-y := evtchn.o xen-gntdev-y := gntdev.o xen-gntalloc-y := gntalloc.o -sxen-privcmd-y := privcmd.o +xen-privcmd-y := privcmd.o xen-platform-pci-y := platform-pci.o -- 2.50.1