diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2010-06-27 16:04:31 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-06-27 16:04:31 +0000 |
| commit | 738012bec4c67e697e766edadab3f522c552a04d (patch) | |
| tree | f989d39323170f589241207d57cf2cc032097819 /hw/musicpal.c | |
| parent | 8a911107386b5c7a78a629f0fe29381cf0ea5f6f (diff) | |
| download | qemu-738012bec4c67e697e766edadab3f522c552a04d.tar.gz qemu-738012bec4c67e697e766edadab3f522c552a04d.tar.bz2 qemu-738012bec4c67e697e766edadab3f522c552a04d.zip | |
Remove useless device dependency of HAS_AUDIO
System architecture dictates whether HAS_AUDIO is defined. It's then
useless to check for HAS_AUDIO in files which are only used on those
architectures which always have audio.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/musicpal.c')
| -rw-r--r-- | hw/musicpal.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/hw/musicpal.c b/hw/musicpal.c index d44c5a0d44..95ef2c6746 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -1486,10 +1486,8 @@ static void musicpal_init(ram_addr_t ram_size, DeviceState *i2c_dev; DeviceState *lcd_dev; DeviceState *key_dev; -#ifdef HAS_AUDIO DeviceState *wm8750_dev; SysBusDevice *s; -#endif i2c_bus *i2c; int i; unsigned long flash_size; @@ -1611,7 +1609,6 @@ static void musicpal_init(ram_addr_t ram_size, qdev_connect_gpio_out(key_dev, i, qdev_get_gpio_in(dev, i + 15)); } -#ifdef HAS_AUDIO wm8750_dev = i2c_create_slave(i2c, "wm8750", MP_WM_ADDR); dev = qdev_create(NULL, "mv88w8618_audio"); s = sysbus_from_qdev(dev); @@ -1619,7 +1616,6 @@ static void musicpal_init(ram_addr_t ram_size, qdev_init_nofail(dev); sysbus_mmio_map(s, 0, MP_AUDIO_BASE); sysbus_connect_irq(s, 0, pic[MP_AUDIO_IRQ]); -#endif musicpal_binfo.ram_size = MP_RAM_DEFAULT_SIZE; musicpal_binfo.kernel_filename = kernel_filename; |