From 012bb3e61e5eced6c610f9e036372bf0c8def2d1 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 5 Oct 2000 01:18:40 +0000 Subject: Merge with Linux 2.4.0-test9. Please check DECstation, I had a number of rejects to fixup while integrating Linus patches. I also found that this kernel will only boot SMP on Origin; the UP kernel freeze soon after bootup with SCSI timeout messages. I commit this anyway since I found that the last CVS versions had the same problem. --- drivers/pci/names.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/pci/names.c') diff --git a/drivers/pci/names.c b/drivers/pci/names.c index a6114e789..4e047d691 100644 --- a/drivers/pci/names.c +++ b/drivers/pci/names.c @@ -131,4 +131,5 @@ pci_class_name(u32 class) return NULL; } -#endif +#endif /* CONFIG_PCI_NAMES */ + -- cgit v1.2.3