projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[cascardo/linux.git]
/
arch
/
mips
/
sni
/
pcimt.c
diff --git
a/arch/mips/sni/pcimt.c
b/arch/mips/sni/pcimt.c
index
44b1ae6
..
834650f
100644
(file)
--- a/
arch/mips/sni/pcimt.c
+++ b/
arch/mips/sni/pcimt.c
@@
-244,9
+244,9
@@
static void pcimt_hwint1(void)
if (pend & IT_EISA) {
int irq;
/*
if (pend & IT_EISA) {
int irq;
/*
- * Note: ASIC PCI's builtin interrupt ac
h
knowledge feature is
+ * Note: ASIC PCI's builtin interrupt acknowledge feature is
* broken. Using it may result in loss of some or all i8259
* broken. Using it may result in loss of some or all i8259
- * interupts, so don't use PCIMT_INT_ACKNOWLEDGE ...
+ * inter
r
upts, so don't use PCIMT_INT_ACKNOWLEDGE ...
*/
irq = i8259_irq();
if (unlikely(irq < 0))
*/
irq = i8259_irq();
if (unlikely(irq < 0))
@@
-284,9
+284,9
@@
static void sni_pcimt_hwint(void)
u32 pending = read_c0_cause() & read_c0_status();
if (pending & C_IRQ5)
u32 pending = read_c0_cause() & read_c0_status();
if (pending & C_IRQ5)
- do_IRQ
(MIPS_CPU_IRQ_BASE + 7);
+ do_IRQ(MIPS_CPU_IRQ_BASE + 7);
else if (pending & C_IRQ4)
else if (pending & C_IRQ4)
- do_IRQ
(MIPS_CPU_IRQ_BASE + 6);
+ do_IRQ(MIPS_CPU_IRQ_BASE + 6);
else if (pending & C_IRQ3)
pcimt_hwint3();
else if (pending & C_IRQ1)
else if (pending & C_IRQ3)
pcimt_hwint3();
else if (pending & C_IRQ1)
@@
-313,7
+313,6
@@
void __init sni_pcimt_init(void)
{
sni_pcimt_detect();
sni_pcimt_sc_init();
{
sni_pcimt_detect();
sni_pcimt_sc_init();
- board_time_init = sni_cpu_time_init;
ioport_resource.end = sni_io_resource.end;
#ifdef CONFIG_PCI
PCIBIOS_MIN_IO = 0x9000;
ioport_resource.end = sni_io_resource.end;
#ifdef CONFIG_PCI
PCIBIOS_MIN_IO = 0x9000;