[Linux-mips-commits]CVS: linux/arch/mips config.in,1.44,1.45

[Pete P. <pp...@us...>]

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

Modified Files:
	config.in 
Log Message:
Sync up with oss tree:

* explicitly set polarity of all interrupts
* added pci_auto config option
* updated defconfig file
* moved the au1000 specific tlb handler to tlbex-r4k.S
* updated au1000.h with IrDA registers



Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- config.in	2001/10/30 18:10:40	1.44
+++ config.in	2001/10/31 06:16:23	1.45
@@ -62,6 +62,10 @@
    fi
    bool 'Support for Globespan IVR board' CONFIG_MIPS_IVR
 bool 'Support for Alchemy Semi PB1000 board' CONFIG_MIPS_PB1000
+   if [ "$CONFIG_MIPS_PB1000" = "y" ]; then
+       bool '    Support for PCI AUTO Config' CONFIG_PCI_AUTO
+   fi
+       
 
 define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y
 define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n
@@ -234,9 +238,9 @@
    define_bool CONFIG_MIPS_AU1000 y
    define_bool CONFIG_NEW_IRQ y
    define_bool CONFIG_PCI y
-   define_bool CONFIG_PC_KEYB y
-   define_bool CONFIG_PCI_AUTO y
    define_bool CONFIG_NEW_PCI y
+   define_bool CONFIG_PC_KEYB y
+   define_int  MAX_HWIFS 1
 fi
 if [ "$CONFIG_COBALT_MICRO_SERVER" = "y" ]; then
    define_bool COBALT_MICRO_SERVER y