diff options
| author | Anthony Liguori | 2011-08-22 01:34:33 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-08-22 01:34:33 +0200 |
| commit | f1a7104a5f435a1bf2a1158e6f737dbd89e8c153 (patch) | |
| tree | 6c5e617e82055e38848db1bf7be9fdff7da900ea /hw/vexpress.c | |
| parent | guest agent: remove uneeded dependencies (diff) | |
| parent | hw/stellaris: Add support for RCC2 register (diff) | |
| download | qemu-f1a7104a5f435a1bf2a1158e6f737dbd89e8c153.tar.gz qemu-f1a7104a5f435a1bf2a1158e6f737dbd89e8c153.tar.xz qemu-f1a7104a5f435a1bf2a1158e6f737dbd89e8c153.zip | |
Merge remote-tracking branch 'pmaydell/armhw-for-upstream' into staging
Diffstat (limited to 'hw/vexpress.c')
| -rw-r--r-- | hw/vexpress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/vexpress.c b/hw/vexpress.c index 9ffd332dee..c9766dd0c4 100644 --- a/hw/vexpress.c +++ b/hw/vexpress.c @@ -150,7 +150,7 @@ static void vexpress_a9_init(ram_addr_t ram_size, /* Daughterboard peripherals : 0x10020000 .. 0x20000000 */ /* 0x10020000 PL111 CLCD (daughterboard) */ - sysbus_create_simple("pl110", 0x10020000, pic[44]); + sysbus_create_simple("pl111", 0x10020000, pic[44]); /* 0x10060000 AXI RAM */ /* 0x100e0000 PL341 Dynamic Memory Controller */ |