diff options
Diffstat (limited to 'hw/twl4030.c')
| -rw-r--r-- | hw/twl4030.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/twl4030.c b/hw/twl4030.c index 355a59e..27e19e9 100644 --- a/hw/twl4030.c +++ b/hw/twl4030.c @@ -24,11 +24,11 @@ #include <sys/time.h> #include "hw.h" -#include "qemu-timer.h" +#include "qemu/timer.h" #include "i2c.h" -#include "sysemu.h" -#include "console.h" -#include "cpu-all.h" +#include "sysemu/sysemu.h" +#include "ui/console.h" +#include "exec/cpu-all.h" //#define DEBUG_GENERAL //#define DEBUG_RTC @@ -1747,7 +1747,7 @@ void *twl4030_init(i2c_bus *bus, qemu_irq irq1, qemu_irq irq2, for (i = 0; i < ARRAY_SIZE(twl4030_info); i++) { DeviceState *ds = i2c_create_slave(bus, twl4030_info[i].name, 0x48 + i); - s->i2c[i] = FROM_I2C_SLAVE(TWL4030NodeState, I2C_SLAVE_FROM_QDEV(ds)); + s->i2c[i] = FROM_I2C_SLAVE(TWL4030NodeState, I2C_SLAVE(ds)); s->i2c[i]->twl4030 = s; } |