From: Jacob Potter Date: Thu, 4 Dec 2008 20:35:10 +0000 (-0500) Subject: fixed merge X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/15521f07dc09a276839c46168201d31ee1ae4a97?ds=inline;hp=--cc fixed merge --- 15521f07dc09a276839c46168201d31ee1ae4a97 diff --cc grubload/multiboot_c.c index 372363c,372363c..5e30dde --- a/grubload/multiboot_c.c +++ b/grubload/multiboot_c.c @@@ -61,9 -61,9 +61,9 @@@ void c_start(unsigned int magic, struc pci_write16(0, 31, 2, 0xC0, 0); pci_write16(0, 31, 4, 0xC0, pci_read16(0, 31, 4, 0xC0)); pci_write16(0, 31, 4, 0xC0, 0); -- ++/* pci_bus_enum(); -- ++*/ /* Open the SMRAM aperture and load our ELF. */ old_smramc = smram_save_state();