summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.target2
-rw-r--r--default-configs/arm-softmmu.mak1
-rw-r--r--default-configs/ppc-softmmu.mak1
-rw-r--r--default-configs/ppc64-softmmu.mak1
-rw-r--r--default-configs/ppcemb-softmmu.mak1
-rw-r--r--default-configs/sh4-softmmu.mak2
-rw-r--r--default-configs/sh4eb-softmmu.mak2
7 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target
index debe0e4c82..7a21164562 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -180,7 +180,7 @@ QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
# USB layer
-obj-y += usb-ohci.o
+obj-$(CONFIG_USB_OHCI) += usb-ohci.o
# PCI network cards
obj-y += eepro100.o
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 2786138b27..15e4373ed3 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for arm-softmmu
CONFIG_GDBSTUB_XML=y
+CONFIG_USB_OHCI=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index d28171b6cb..cc4b83a6aa 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for ppc-softmmu
CONFIG_GDBSTUB_XML=y
+CONFIG_USB_OHCI=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index fe66524222..a4d08ffd5f 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for ppc64-softmmu
CONFIG_GDBSTUB_XML=y
+CONFIG_USB_OHCI=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index bff13e605b..19ea261ce5 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for ppcemb-softmmu
CONFIG_GDBSTUB_XML=y
+CONFIG_USB_OHCI=y
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 44668357c7..9c2445b88a 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for sh4-softmmu
+
+CONFIG_USB_OHCI=y
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index 2f60e53adb..fa54f10876 100644
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -1 +1,3 @@
# Default configuration for sh4eb-softmmu
+
+CONFIG_USB_OHCI=y