aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-07-24 22:49:02 +0200
committerAndreas Färber <afaerber@suse.de>2013-07-29 21:06:27 +0200
commit0ee10242fd5c40ef0268147b23ba225b843e2d20 (patch)
treed453abfd950afd12c0161709fe38e728f4e9ea47
parent8d8e34815e46a45afaa2689b49d5f97b6306b7f3 (diff)
lm32_juart: Relocate and tidy header
Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--MAINTAINERS1
-rw-r--r--hw/char/lm32_juart.c2
-rw-r--r--include/hw/char/lm32_juart.h (renamed from include/hw/lm32/lm32_juart.h)6
-rw-r--r--target-lm32/op_helper.c2
4 files changed, 6 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 93ad19d90e..82ca5fb60a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -80,6 +80,7 @@ M: Michael Walle <michael@walle.cc>
S: Maintained
F: target-lm32/
F: hw/lm32/
+F: hw/char/lm32_*
M68K
M: Paul Brook <paul@codesourcery.com>
diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c
index 839f3ebfe7..154511e633 100644
--- a/hw/char/lm32_juart.c
+++ b/hw/char/lm32_juart.c
@@ -22,7 +22,7 @@
#include "trace.h"
#include "sysemu/char.h"
-#include "hw/lm32/lm32_juart.h"
+#include "hw/char/lm32_juart.h"
enum {
LM32_JUART_MIN_SAVE_VERSION = 0,
diff --git a/include/hw/lm32/lm32_juart.h b/include/hw/char/lm32_juart.h
index 67fc5866ea..1cd3148e62 100644
--- a/include/hw/lm32/lm32_juart.h
+++ b/include/hw/char/lm32_juart.h
@@ -1,7 +1,7 @@
-#ifndef QEMU_HW_LM32_JUART_H
-#define QEMU_HW_LM32_JUART_H
+#ifndef QEMU_HW_CHAR_LM32_JUART_H
+#define QEMU_HW_CHAR_LM32_JUART_H
-#include "qemu-common.h"
+#include "hw/qdev.h"
uint32_t lm32_juart_get_jtx(DeviceState *d);
uint32_t lm32_juart_get_jrx(DeviceState *d);
diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c
index f106873ad8..2dab9f27b4 100644
--- a/target-lm32/op_helper.c
+++ b/target-lm32/op_helper.c
@@ -4,7 +4,7 @@
#include "qemu/host-utils.h"
#include "hw/lm32/lm32_pic.h"
-#include "hw/lm32/lm32_juart.h"
+#include "hw/char/lm32_juart.h"
#if !defined(CONFIG_USER_ONLY)
#define MMUSUFFIX _mmu