Revision 7f55c7ce

b/Makefile.objs
161 161

  
162 162
# VGA
163 163
hw-obj-$(CONFIG_VGA_PCI) += vga-pci.o
164
hw-obj-$(CONFIG_VGA_ISA) += vga-isa.o
164 165

  
165 166
######################################################################
166 167
# libdis
b/Makefile.target
199 199
# Hardware support
200 200
obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o
201 201
obj-i386-y += pckbd.o $(sound-obj-y) dma.o
202
obj-i386-y += vga.o vga-isa.o
202
obj-i386-y += vga.o
203 203
obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o pc.o
204 204
obj-i386-y += cirrus_vga.o apic.o ioapic.o acpi.o piix_pci.o
205 205
obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
......
230 230
obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
231 231
obj-mips-y += mips_addr.o mips_timer.o mips_int.o
232 232
obj-mips-y += dma.o vga.o serial.o i8259.o rc4030.o
233
obj-mips-y += vga-isa.o vga-isa-mm.o
233
obj-mips-y += vga-isa-mm.o
234 234
obj-mips-y += g364fb.o jazz_led.o dp8393x.o
235 235
obj-mips-y += ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o
236 236
obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
b/default-configs/i386-softmmu.mak
2 2

  
3 3
CONFIG_USB_OHCI=y
4 4
CONFIG_VGA_PCI=y
5
CONFIG_VGA_ISA=y
5 6
CONFIG_PARALLEL=y
6 7
CONFIG_I8254=y
7 8
CONFIG_PCSPK=y
b/default-configs/mips-softmmu.mak
3 3
CONFIG_ISA_MMIO=y
4 4
CONFIG_ESP=y
5 5
CONFIG_VGA_PCI=y
6
CONFIG_VGA_ISA=y
6 7
CONFIG_PARALLEL=y
7 8
CONFIG_I8254=y
8 9
CONFIG_PCSPK=y
b/default-configs/mips64-softmmu.mak
3 3
CONFIG_ISA_MMIO=y
4 4
CONFIG_ESP=y
5 5
CONFIG_VGA_PCI=y
6
CONFIG_VGA_ISA=y
6 7
CONFIG_PARALLEL=y
7 8
CONFIG_I8254=y
8 9
CONFIG_PCSPK=y
b/default-configs/mips64el-softmmu.mak
3 3
CONFIG_ISA_MMIO=y
4 4
CONFIG_ESP=y
5 5
CONFIG_VGA_PCI=y
6
CONFIG_VGA_ISA=y
6 7
CONFIG_PARALLEL=y
7 8
CONFIG_I8254=y
8 9
CONFIG_PCSPK=y
b/default-configs/mipsel-softmmu.mak
3 3
CONFIG_ISA_MMIO=y
4 4
CONFIG_ESP=y
5 5
CONFIG_VGA_PCI=y
6
CONFIG_VGA_ISA=y
6 7
CONFIG_PARALLEL=y
7 8
CONFIG_I8254=y
8 9
CONFIG_PCSPK=y
b/default-configs/x86_64-softmmu.mak
2 2

  
3 3
CONFIG_USB_OHCI=y
4 4
CONFIG_VGA_PCI=y
5
CONFIG_VGA_ISA=y
5 6
CONFIG_PARALLEL=y
6 7
CONFIG_I8254=y
7 8
CONFIG_PCSPK=y

Also available in: Unified diff