diff options
author | Linaro Packagers <linaro-pkg@lists.launchpad.net> | 2013-02-25 10:33:42 +0000 |
---|---|---|
committer | Fathi Boudra <fathi.boudra@linaro.org> | 2013-03-30 21:18:26 +0200 |
commit | c3565b8703553405641c76a4c40961473d051edd (patch) | |
tree | 01be1a3169d8c72f8e0fd406b81eea561e7f87e7 /hw/wm8750.c | |
parent | edde41b3c75bce779549bd2e1dba18eb7beb8267 (diff) | |
parent | 050a840ead5e51a1a9f3bffe89cc89077b2f35ed (diff) |
Imported Debian patch 1.4.0-2013.03-0ubuntu1~linaro1debian/1.4.0-2013.03-0ubuntu1_linaro1
Diffstat (limited to 'hw/wm8750.c')
-rw-r--r-- | hw/wm8750.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/wm8750.c b/hw/wm8750.c index 44f138f..d3ea5ba 100644 --- a/hw/wm8750.c +++ b/hw/wm8750.c @@ -632,7 +632,7 @@ static void wm8750_fini(I2CSlave *i2c) void wm8750_data_req_set(DeviceState *dev, void (*data_req)(void *, int, int), void *opaque) { - WM8750State *s = FROM_I2C_SLAVE(WM8750State, I2C_SLAVE_FROM_QDEV(dev)); + WM8750State *s = FROM_I2C_SLAVE(WM8750State, I2C_SLAVE(dev)); s->data_req = data_req; s->opaque = opaque; } @@ -701,7 +701,7 @@ static void wm8750_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_wm8750; } -static TypeInfo wm8750_info = { +static const TypeInfo wm8750_info = { .name = "wm8750", .parent = TYPE_I2C_SLAVE, .instance_size = sizeof(WM8750State), |