diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:39:34 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:40:49 +0100 |
| commit | 501a7ce7270955be151c442c27620fa7af2f3ce5 (patch) | |
| tree | 0374e4d581a0246074d55712b81baf01f3c439b6 /hw/pl110.c | |
| parent | 62e0c095450f6a7eb37914991f3f7966aa4da7a1 (diff) | |
| parent | 36f25d2537c40c6c47f4abee5d31a24863d1adf7 (diff) | |
Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu
Adapt header include paths.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/pl110.c')
| -rw-r--r-- | hw/pl110.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/pl110.c b/hw/pl110.c index f869ba60d7..098e335aea 100644 --- a/hw/pl110.c +++ b/hw/pl110.c @@ -8,8 +8,9 @@ */ #include "sysbus.h" -#include "console.h" +#include "ui/console.h" #include "framebuffer.h" +#include "ui/pixel_ops.h" #define PL110_CR_EN 0x001 #define PL110_CR_BGR 0x100 @@ -109,8 +110,6 @@ static const unsigned char *idregs[] = { pl111_id }; -#include "pixel_ops.h" - #define BITS 8 #include "pl110_template.h" #define BITS 15 |