From: Peter Maydell Date: Fri, 19 Feb 2016 12:03:24 +0000 (+0000) Subject: tusb6010: move from hw/timer to hw/usb X-Git-Tag: v2.6.0-rc0~91^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14ec7b2c5bc0e7b0f7097211d349b57450f09d02;p=thirdparty%2Fqemu.git tusb6010: move from hw/timer to hw/usb The TUSB6010 is a USB controller (as the name suggests). Move it from hw/timer (where it was accidentally filed in 2013 when we moved everything out of hw/) to hw/usb. Signed-off-by: Peter Maydell Message-id: 1455883404-10976-1-git-send-email-peter.maydell@linaro.org Signed-off-by: Gerd Hoffmann --- diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index 133bd0d455f..5cfea6e0da1 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -25,7 +25,6 @@ obj-$(CONFIG_OMAP) += omap_gptimer.o obj-$(CONFIG_OMAP) += omap_synctimer.o obj-$(CONFIG_PXA2XX) += pxa2xx_timer.o obj-$(CONFIG_SH4) += sh_timer.o -obj-$(CONFIG_TUSB6010) += tusb6010.o obj-$(CONFIG_DIGIC) += digic-timer.o obj-$(CONFIG_MC146818RTC) += mc146818rtc.o diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 8f00fbd8f6d..2717027d343 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -10,6 +10,8 @@ common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci-sysbus.o common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o +obj-$(CONFIG_TUSB6010) += tusb6010.o + # emulated usb devices common-obj-$(CONFIG_USB) += dev-hub.o common-obj-$(CONFIG_USB) += dev-hid.o diff --git a/hw/timer/tusb6010.c b/hw/usb/tusb6010.c similarity index 100% rename from hw/timer/tusb6010.c rename to hw/usb/tusb6010.c