fixed merge

[netwatch.git] / grubload / multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index 372363c60b2c0e57cc7dc7d6853247bd2917a2d5..5e30dde991d41efa29074137b1ceb837503d83fd 100644 (file)
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -61,9 +61,9 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
        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();