ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/audio/ac97: Remove bad merge conflict resolution

This commit is contained in:
Matt Borgerson 2025-01-06 04:08:41 -07:00
parent c09199a287
commit 1aa8825ec9
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/audio/ac97.c
View File

@ -1300,10 +1300,6 @@ static void ac97_realize (PCIDevice *dev, Error **errp)
AC97DeviceState *s = AC97_DEVICE(dev);
uint8_t *c = s->dev.config;
if (!AUD_register_card ("ac97", &s->card, errp)) {
return;
}
/* TODO: no need to override */
c[PCI_COMMAND] = 0x00; /* pcicmd pci command rw, ro */
c[PCI_COMMAND + 1] = 0x00;