diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /drivers/serial/ioc4_serial.c | |
parent | 7cb3cd090c2725b80561958a362c2ba15a7a8c86 (diff) | |
parent | 9123e0d78990246304fe681167b8d8097f1e02d7 (diff) |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/serial/ioc4_serial.c')
-rw-r--r-- | drivers/serial/ioc4_serial.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c index 0c5c96a582b3..f88fdd480685 100644 --- a/drivers/serial/ioc4_serial.c +++ b/drivers/serial/ioc4_serial.c | |||
@@ -973,18 +973,6 @@ static irqreturn_t ioc4_intr(int irq, void *arg, struct pt_regs *regs) | |||
973 | this_ir &= ~this_mir; | 973 | this_ir &= ~this_mir; |
974 | } | 974 | } |
975 | } | 975 | } |
976 | if (this_ir) { | ||
977 | printk(KERN_ERR | ||
978 | "unknown IOC4 %s interrupt 0x%x, sio_ir = 0x%x," | ||
979 | " sio_ies = 0x%x, other_ir = 0x%x :" | ||
980 | "other_ies = 0x%x\n", | ||
981 | (intr_type == IOC4_SIO_INTR_TYPE) ? "sio" : | ||
982 | "other", this_ir, | ||
983 | readl(&soft->is_ioc4_misc_addr->sio_ir.raw), | ||
984 | readl(&soft->is_ioc4_misc_addr->sio_ies.raw), | ||
985 | readl(&soft->is_ioc4_misc_addr->other_ir.raw), | ||
986 | readl(&soft->is_ioc4_misc_addr->other_ies.raw)); | ||
987 | } | ||
988 | } | 976 | } |
989 | #ifdef DEBUG_INTERRUPTS | 977 | #ifdef DEBUG_INTERRUPTS |
990 | { | 978 | { |