From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0p-0003YB-Pk for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0k-0002U1-Rt for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:43 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53377 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0k-0002Tu-LR for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:38 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:43 +0200 Message-Id: <1375125630-24869-67-git-send-email-afaerber@suse.de> In-Reply-To: <1375125630-24869-1-git-send-email-afaerber@suse.de> References: <1375125630-24869-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 066/173] lm32_juart: Relocate and tidy header List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Michael Walle , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- MAINTAINERS | 1 + hw/char/lm32_juart.c | 2 +- include/hw/{lm32 =3D> char}/lm32_juart.h | 6 +++--- target-lm32/op_helper.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) rename include/hw/{lm32 =3D> char}/lm32_juart.h (72%) diff --git a/MAINTAINERS b/MAINTAINERS index 93ad19d..82ca5fb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -80,6 +80,7 @@ M: Michael Walle S: Maintained F: target-lm32/ F: hw/lm32/ +F: hw/char/lm32_* =20 M68K M: Paul Brook diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c index 839f3eb..154511e 100644 --- a/hw/char/lm32_juart.c +++ b/hw/char/lm32_juart.c @@ -22,7 +22,7 @@ #include "trace.h" #include "sysemu/char.h" =20 -#include "hw/lm32/lm32_juart.h" +#include "hw/char/lm32_juart.h" =20 enum { LM32_JUART_MIN_SAVE_VERSION =3D 0, diff --git a/include/hw/lm32/lm32_juart.h b/include/hw/char/lm32_juart.h similarity index 72% rename from include/hw/lm32/lm32_juart.h rename to include/hw/char/lm32_juart.h index 67fc586..1cd3148 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 =20 -#include "qemu-common.h" +#include "hw/qdev.h" =20 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 f106873..2dab9f2 100644 --- a/target-lm32/op_helper.c +++ b/target-lm32/op_helper.c @@ -4,7 +4,7 @@ #include "qemu/host-utils.h" =20 #include "hw/lm32/lm32_pic.h" -#include "hw/lm32/lm32_juart.h" +#include "hw/char/lm32_juart.h" =20 #if !defined(CONFIG_USER_ONLY) #define MMUSUFFIX _mmu --=20 1.8.1.4