diff options
| author | malc | 2011-08-05 08:07:10 +0200 |
|---|---|---|
| committer | malc | 2011-08-05 08:07:10 +0200 |
| commit | a67a47d2b559a7733c3f89aeb2d81b19d2c027e4 (patch) | |
| tree | 146a7b6eebbee1367453fde501d4462ac6d9f8b4 /hw/stellaris.c | |
| parent | Merge branch 'master' of git://git.qemu.org/qemu (diff) | |
| parent | Merge remote-tracking branch 'mst/for_anthony' into staging (diff) | |
| download | qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.tar.gz qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.tar.xz qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'hw/stellaris.c')
| -rw-r--r-- | hw/stellaris.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/stellaris.c b/hw/stellaris.c index ac9fcc1f38..a28093043a 100644 --- a/hw/stellaris.c +++ b/hw/stellaris.c @@ -4,7 +4,7 @@ * Copyright (c) 2006 CodeSourcery. * Written by Paul Brook * - * This code is licenced under the GPL. + * This code is licensed under the GPL. */ #include "sysbus.h" @@ -1230,7 +1230,7 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model, } } - stellaris_sys_init(0x400fe000, pic[28], board, nd_table[0].macaddr); + stellaris_sys_init(0x400fe000, pic[28], board, nd_table[0].macaddr.a); for (i = 0; i < 7; i++) { if (board->dc4 & (1 << i)) { |