[Linux-mips-commits]CVS: linux/arch/mips/sibyte/sb1250 Makefile,1.3,1.4 pci.c,1.1,1.2

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/sibyte/sb1250
In directory usw-pr-cvs1:/tmp/cvs-serv5277

Modified Files:
	Makefile pci.c 
Log Message:
Remove #ifdef CONFIG_PCI ... #endif wrapper.Resurrect lib_hssubr.o.  A bug elsewhere was resulting in it not be referenced ever.  Compile pci.o only if CONFIG_PCI set.

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/sibyte/sb1250/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	2001/11/20 18:14:35	1.3
+++ Makefile	2001/11/21 22:07:56	1.4
@@ -5,8 +5,9 @@
 
 O_TARGET := sb1250.o
 
-obj-y := setup.o irq.o irq_handler.o time.o pci.o # lib_hssubr.o
+obj-y := setup.o irq.o irq_handler.o time.o lib_hssubr.o
 
+obj-$(CONFIG_PCI) += pci.o
 obj-$(CONFIG_SMP) += smp.o
 obj-$(CONFIG_BCM1250_TBPROF) += bcm1250_tbprof.o
 

Index: pci.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/sibyte/sb1250/pci.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pci.c	2001/11/08 17:42:08	1.1
+++ pci.c	2001/11/21 22:07:56	1.2
@@ -36,10 +36,6 @@
  * that is used so rarely (how much space in the page tables?)
  *
  */
-#include <linux/config.h>
-
-#ifdef CONFIG_PCI
-
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
@@ -331,5 +327,3 @@
 {
 	return 1;
 }
-
-#endif				/* CONFIG_PCI */