2016-07-14 17:50:35 +02:00
|
|
|
From 49ca2dd08ac9edce6d828328069d1092f3a63b50 Mon Sep 17 00:00:00 2001
|
2016-06-10 17:24:43 +02:00
|
|
|
From: Bruce Rogers <brogers@suse.com>
|
|
|
|
|
Date: Fri, 10 Jun 2016 07:12:15 -0600
|
|
|
|
|
Subject: [PATCH] usb: Fix conditions that xen-usb.c is used
|
|
|
|
|
|
|
|
|
|
When non-x86 arch targets are built on x86 we have a mismatched
|
|
|
|
|
between what is built in support of xen. xen-usb.c is conditioned
|
|
|
|
|
upon CONFIG_USB_LIBUSB and CONFIG_XEN_BACKEND, but it relies on
|
|
|
|
|
an external reference that is instead controlled by CONFIG_XEN.
|
|
|
|
|
Add a dependency on CONFIG_XEN as well.
|
|
|
|
|
[BR: FATE#316612]
|
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
|
|
|
---
|
|
|
|
|
hw/usb/Makefile.objs | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
|
|
|
|
|
index 98b5c9d..2db2fa1 100644
|
|
|
|
|
--- a/hw/usb/Makefile.objs
|
|
|
|
|
+++ b/hw/usb/Makefile.objs
|
|
|
|
|
@@ -39,6 +39,6 @@ common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o
|
|
|
|
|
# usb pass-through
|
|
|
|
|
common-obj-y += $(patsubst %,host-%.o,$(HOST_USB))
|
|
|
|
|
|
|
|
|
|
-ifeq ($(CONFIG_USB_LIBUSB),y)
|
|
|
|
|
+ifeq ($(CONFIG_XEN)$(CONFIG_USB_LIBUSB),yy)
|
|
|
|
|
common-obj-$(CONFIG_XEN_BACKEND) += xen-usb.o
|
|
|
|
|
endif
|
