bios32.c compilation errors in 2.1.16

Thomas Bogendoerfer (tsbogend@alpha.franken.de)
Thu, 19 Dec 1996 22:49:46 +0100 (CET)


I'm sorry for the problem with the changed bios32.c in 2.1.16. Below is
a patch contributed by David C Niemi, which should solve the problem.

Thomas.

--- linux/arch/i386/kernel/bios32.c.orig Thu Dec 19 12:28:47 1996
+++ linux/arch/i386/kernel/bios32.c Thu Dec 19 13:15:54 1996
@@ -105,6 +105,7 @@
char chars[16];
};

+#ifdef CONFIG_PCI
/*
* Physical address of the service directory. I don't know if we're
* allowed to have more than one of these or not, so just in case
@@ -118,7 +119,6 @@
unsigned short segment;
} bios32_indirect = { 0, KERNEL_CS };

-#ifdef CONFIG_PCI

/*
* function table for accessing PCI configuration space
@@ -619,7 +619,6 @@
pci_conf2_write_config_dword
};

-#endif

struct pci_access *check_direct_pci(void)
{
@@ -773,9 +772,11 @@
return mem_start;
}

+#endif

unsigned long pcibios_init(unsigned long memory_start, unsigned long memory_end)
{
+#ifdef CONFIG_PCI
union bios32 *check;
unsigned char sum;
int i, length;
@@ -818,7 +819,6 @@
}
}
}
-#ifdef CONFIG_PCI
if (bios32_entry) {
memory_start = check_pcibios (memory_start, memory_end);
}

-- 
See, you not only have to be a good coder to create a system like Linux,
you have to be a sneaky bastard too ;-)
                   [Linus Torvalds in <4rikft$7g5@linux.cs.Helsinki.FI>]