diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-15 17:06:04 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-15 17:06:04 -0500 |
| commit | 4ceb193d30fe9b1cda0dc73bddb8051659926fb9 (patch) | |
| tree | a9ffbe92293ba9b0cc3298591e7564aae19a0ef1 /hw/usb/dev-serial.c | |
| parent | a907cf59d8a41ecb909ad4367cd016c7d71f8546 (diff) | |
| parent | c72dd2d04bd28f7ec6b073316270258684ba5fc3 (diff) | |
| download | focaccia-qemu-4ceb193d30fe9b1cda0dc73bddb8051659926fb9.tar.gz focaccia-qemu-4ceb193d30fe9b1cda0dc73bddb8051659926fb9.zip | |
Merge remote-tracking branch 'bonzini/hw-dirs' into staging
* bonzini/hw-dirs: exec: remove useless declarations from memory-internal.h memory: move core typedefs to qemu/typedefs.h include: avoid useless includes of exec/ headers sysemu: avoid proliferation of include/ subdirectories tpm: reorganize headers and split hardware part configure: fix TPM logic acpi.h: make it self contained acpi: move declarations from pc.h to acpi.h hw: Add lost ARM core again Fix failure to create q35 machine Add linux-headers to QEMU_INCLUDES arm: fix location of some include files Conflicts: configure aliguori: trivial conflict in configure output Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/usb/dev-serial.c')
| -rw-r--r-- | hw/usb/dev-serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 7c314dc59d..dd0a608bff 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -12,7 +12,7 @@ #include "qemu/error-report.h" #include "hw/usb.h" #include "hw/usb/desc.h" -#include "char/char.h" +#include "sysemu/char.h" //#define DEBUG_Serial |