Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel

Conflicts:
	arch/arm/mach-mx5/clock-mx51-mx53.c
	arch/arm/mach-mx5/devices-imx53.h

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index 225123b37f19..58be715913cd 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -4450,7 +4450,7 @@ static int __init rs_init(void)
 
 #if defined(CONFIG_ETRAX_RS485)
 #if defined(CONFIG_ETRAX_RS485_ON_PA)
-        if (cris_io_interface_allocate_pins(if_ser0, 'a', rs485_pa_bit,
+        if (cris_io_interface_allocate_pins(if_serial_0, 'a', rs485_pa_bit,
                         rs485_pa_bit)) {
                 printk(KERN_CRIT "ETRAX100LX serial: Could not allocate "
                         "RS485 pin\n");
@@ -4459,7 +4459,7 @@ static int __init rs_init(void)
         }
 #endif
 #if defined(CONFIG_ETRAX_RS485_ON_PORT_G)
-        if (cris_io_interface_allocate_pins(if_ser0, 'g', rs485_pa_bit,
+        if (cris_io_interface_allocate_pins(if_serial_0, 'g', rs485_pa_bit,
                         rs485_port_g_bit)) {
                 printk(KERN_CRIT "ETRAX100LX serial: Could not allocate "
                         "RS485 pin\n");