Update of /cvsroot/linux-mips/linux/arch/mips/vr4122/eagle
In directory usw-pr-cvs1:/tmp/cvs-serv30706/vr4122/eagle
Modified Files:
irq.c pci.c
Log Message:
Osprey fixs that where posted. Thank you.
Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr4122/eagle/irq.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- irq.c 2001/09/22 04:27:15 1.1
+++ irq.c 2001/10/08 18:06:07 1.2
@@ -55,7 +55,7 @@
spin_lock_irqsave(&vr4122_icu_lock, flags);
status = read_32bit_cp0_register(CP0_STATUS);
status |= (1UL << (irq + 8));
- set_cp0_status(ST0_IM, status);
+ set_cp0_status(status);
spin_unlock_irqrestore(&vr4122_icu_lock, flags);
}
@@ -66,7 +66,7 @@
spin_lock_irqsave(&vr4122_icu_lock, flags);
status = read_32bit_cp0_register(CP0_STATUS);
status &= ~(1UL << (irq + 8));
- set_cp0_status(ST0_IM, status);
+ set_cp0_status(status);
spin_unlock_irqrestore(&vr4122_icu_lock, flags);
}
Index: pci.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr4122/eagle/pci.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pci.c 2001/09/22 04:27:15 1.1
+++ pci.c 2001/10/08 18:06:07 1.2
@@ -210,6 +210,7 @@
/* assume it's a generic PCI interrupt */
dev->irq = VR4122_IRQ_PCI;
+#if 0
/* if it's wired differently, correct the assumption */
switch (dev->vendor) {
case PCI_VENDOR_ID_NEC:
@@ -227,6 +228,7 @@
dev->irq = VR4122_IRQ_MQ200;
break;
}
+#endif
}
static void __init pcibios_fixup_irqs(void)
@@ -243,6 +245,11 @@
void __init pcibios_fixup_bus(struct pci_bus *b)
{
+}
+
+unsigned __init int pcibios_assign_all_busses(void)
+{
+ return 1;
}
void pcibios_update_resource(struct pci_dev *dev, struct resource *root,
|
