aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100
diff options
context:
space:
mode:
authorDmitry Artamonow <mad_soft@inbox.ru>2009-11-27 11:10:58 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 16:52:25 +0000
commit2a151a0f12b136d28f0501fa294462f8e9e310a1 (patch)
tree9731770f0c6483ebe916d5d64bfb97a63e966ede /arch/arm/mach-sa1100
parent1e23221e98deff9ef9adad5f2f991723f080b1ee (diff)
ARM: 5796/1: SA1100: h3600: remove IRDA bits from serial PM callback
IRDA is handled by separate sa1100-ir driver and has nothing to do with sa1100_serial Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100')
-rw-r--r--arch/arm/mach-sa1100/h3600.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index ebb3b8dcee5..5033c030a3f 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -155,11 +155,8 @@ static u_int h3xxx_uart_get_mctrl(struct uart_port *port)
static void h3xxx_uart_pm(struct uart_port *port, u_int state, u_int oldstate)
{
- if (port->mapbase == _Ser2UTCR0) { /* TODO: REMOVE THIS */
- assign_h3600_egpio(IPAQ_EGPIO_IR_ON, !state);
- } else if (port->mapbase == _Ser3UTCR0) {
+ if (port->mapbase == _Ser3UTCR0)
assign_h3600_egpio(IPAQ_EGPIO_RS232_ON, !state);
- }
}
/*