From: Konrad Rzeszutek Wilk Date: Thu, 2 Feb 2012 19:59:22 +0000 (-0500) Subject: Merge conflict resolved. Somehow the letter 's' slipped in X-Git-Tag: v2.6.39-400.9.0~595^2~14^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=70a3d8d324b9aa4dc130c01029b042d89cda071f;p=users%2Fjedix%2Flinux-maple.git Merge conflict resolved. Somehow the letter 's' slipped in the Makefile. This fixes the compile issues. Signed-off-by: Konrad Rzeszutek Wilk --- 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