From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYAcR-0002qD-Kp for qemu-devel@nongnu.org; Tue, 23 Feb 2016 05:55:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYAcQ-00023p-J3 for qemu-devel@nongnu.org; Tue, 23 Feb 2016 05:55:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33555) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYAcQ-00023e-DU for qemu-devel@nongnu.org; Tue, 23 Feb 2016 05:55:02 -0500 From: Gerd Hoffmann Date: Tue, 23 Feb 2016 11:54:54 +0100 Message-Id: <1456224898-23270-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1456224898-23270-1-git-send-email-kraxel@redhat.com> References: <1456224898-23270-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 2/6] tusb6010: move from hw/timer to hw/usb List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Gerd Hoffmann From: Peter Maydell 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 --- hw/timer/Makefile.objs | 1 - hw/usb/Makefile.objs | 2 ++ hw/{timer => usb}/tusb6010.c | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename hw/{timer => usb}/tusb6010.c (100%) diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index 133bd0d..5cfea6e 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 8f00fbd..2717027 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 -- 1.8.3.1