From afb9a60ecb391cbccfd38e6bf400ebfcf40c5d0c Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 7 Mar 2012 15:06:32 +0100 Subject: usb: zap hw/ush-{ohic,uhci}.h + init wrappers Remove the uhci and ohci init wrappers, which all wrapped a pci_create_simple() one-liner. Switch callsites to call pci_create_simple directly. Remove the header files where the wrappers where declared. Signed-off-by: Gerd Hoffmann --- hw/ppc_newworld.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'hw/ppc_newworld.c') diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index 506187b..2fec5b4 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -54,7 +54,6 @@ #include "nvram.h" #include "pc.h" #include "pci.h" -#include "usb-ohci.h" #include "net.h" #include "sysemu.h" #include "boards.h" @@ -352,7 +351,7 @@ static void ppc_core99_init (ram_addr_t ram_size, dbdma_mem, cuda_mem, NULL, 3, ide_mem, escc_bar); if (usb_enabled) { - usb_ohci_init_pci(pci_bus, -1); + pci_create_simple(pci_bus, -1, "pci-ohci"); } /* U3 needs to use USB for input because Linux doesn't support via-cuda -- cgit v1.1