diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-21 18:34:33 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-21 18:34:33 -0500 |
commit | f1a7104a5f435a1bf2a1158e6f737dbd89e8c153 (patch) | |
tree | 6c5e617e82055e38848db1bf7be9fdff7da900ea /hw/realview.c | |
parent | 957f1f99f263d57612807a9535f75ca4473f05f0 (diff) | |
parent | dc804ab77630f5f3d28a9fb7487966d29f505829 (diff) |
Merge remote-tracking branch 'pmaydell/armhw-for-upstream' into staging
Diffstat (limited to 'hw/realview.c')
-rw-r--r-- | hw/realview.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/realview.c b/hw/realview.c index 94ab900512..549bb150c6 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -251,7 +251,7 @@ static void realview_init(ram_addr_t ram_size, sysbus_create_simple("pl061", 0x10014000, pic[7]); gpio2 = sysbus_create_simple("pl061", 0x10015000, pic[8]); - sysbus_create_simple("pl110_versatile", 0x10020000, pic[23]); + sysbus_create_simple("pl111", 0x10020000, pic[23]); dev = sysbus_create_varargs("pl181", 0x10005000, pic[17], pic[18], NULL); /* Wire up MMC card detect and read-only signals. These have |