@@ -281,7 +281,7 @@ void mips_r4k_init (ram_addr_t ram_size,
}
}
- isa_vga_init(isa_bus);
+ isa_std_vga_init(isa_bus);
if (nd_table[0].used)
isa_ne2000_init(isa_bus, 0x300, 9, &nd_table[0]);
@@ -1043,7 +1043,7 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)
if (pci_bus) {
dev = pci_std_vga_init(pci_bus);
} else {
- dev = isa_vga_init(isa_bus);
+ dev = isa_std_vga_init(isa_bus);
}
}
@@ -176,7 +176,7 @@ enum vga_retrace_method {
extern enum vga_retrace_method vga_retrace_method;
-static inline DeviceState *isa_vga_init(ISABus *bus)
+static inline DeviceState *isa_std_vga_init(ISABus *bus)
{
ISADevice *dev;
This better explains what is this function about. Adjust all callers. Cc: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> --- hw/mips_r4k.c | 2 +- hw/pc.c | 2 +- hw/pc.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)