Update of /cvsroot/linux-mips/linux/arch/mips/configs
In directory usw-pr-cvs1:/tmp/cvs-serv20100/arch/mips/configs
Modified Files:
defconfig-pb1000
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: defconfig-pb1000
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-pb1000,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- defconfig-pb1000 2001/10/26 16:37:55 1.11
+++ defconfig-pb1000 2001/10/31 06:16:24 1.12
@@ -37,6 +37,7 @@
# CONFIG_MIPS_ITE8172 is not set
# CONFIG_MIPS_IVR is not set
CONFIG_MIPS_PB1000=y
+CONFIG_PCI_AUTO=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
# CONFIG_MCA is not set
@@ -44,9 +45,9 @@
CONFIG_MIPS_AU1000=y
CONFIG_NEW_IRQ=y
CONFIG_PCI=y
-CONFIG_PC_KEYB=y
-CONFIG_PCI_AUTO=y
CONFIG_NEW_PCI=y
+CONFIG_PC_KEYB=y
+MAX_HWIFS=1
# CONFIG_ISA is not set
# CONFIG_EISA is not set
# CONFIG_I8259 is not set
|
