Merge conflict resolved. Somehow the letter 's' slipped in

the Makefile. This fixes the compile issues.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 917d1886d0754fe91d5fee3a94f25d792bdc6037..db9ec72749658fa0d97b7dbb6ad4bf8537388623 100644 (file)
--- 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