diff options
| author | Peter Maydell | 2018-02-02 16:33:57 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-02-02 16:33:57 +0100 |
| commit | fabbd691fd7db2e71c6702089c9656e7047eac24 (patch) | |
| tree | 57b8c2b9a2e318cebc9c745bf4cb8b65bb490b13 /hw/arm/spitz.c | |
| parent | Merge remote-tracking branch 'remotes/cminyard/tags/for-release-20180201' int... (diff) | |
| parent | hw/audio/sb16.c: change dolog() to qemu_log_mask() (diff) | |
| download | qemu-fabbd691fd7db2e71c6702089c9656e7047eac24.tar.gz qemu-fabbd691fd7db2e71c6702089c9656e7047eac24.tar.xz qemu-fabbd691fd7db2e71c6702089c9656e7047eac24.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/audio-20180202-pull-request' into staging
audio: two small fixes.
# gpg: Signature made Fri 02 Feb 2018 07:49:20 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/audio-20180202-pull-request:
hw/audio/sb16.c: change dolog() to qemu_log_mask()
hw/audio/wm8750: move WM8750 declarations from i2c/i2c.h to audio/wm8750.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/spitz.c')
| -rw-r--r-- | hw/arm/spitz.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index ac1e15cbbc..e419e3c00e 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -24,6 +24,7 @@ #include "hw/devices.h" #include "hw/arm/sharpsl.h" #include "ui/console.h" +#include "hw/audio/wm8750.h" #include "audio/audio.h" #include "hw/boards.h" #include "sysemu/block-backend.h" @@ -745,7 +746,7 @@ static void spitz_i2c_setup(PXA2xxState *cpu) DeviceState *wm; /* Attach a WM8750 to the bus */ - wm = i2c_create_slave(bus, "wm8750", 0); + wm = i2c_create_slave(bus, TYPE_WM8750, 0); spitz_wm8750_addr(wm, 0, 0); qdev_connect_gpio_out(cpu->gpio, SPITZ_GPIO_WM, |