1 --- a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
2 +++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
3 @@ -235,7 +235,7 @@ struct omap_hwmod_irq_info omap2_timer11
6 struct omap_hwmod_irq_info omap2_uart1_mpu_irqs[] = {
7 - { .irq = INT_24XX_UART1_IRQ, },
12 --- a/drivers/tty/serial/omap-serial.c
13 +++ b/drivers/tty/serial/omap-serial.c
14 @@ -517,8 +517,10 @@ static int serial_omap_startup(struct ua
18 - retval = request_irq(up->port.irq, serial_omap_irq, up->port.irqflags,
22 + retval = request_irq(up->port.irq, serial_omap_irq,
23 + up->port.irqflags, up->name, up);
27 @@ -629,7 +631,8 @@ static void serial_omap_shutdown(struct
30 pm_runtime_put(&up->pdev->dev);
31 - free_irq(up->port.irq, up);
33 + free_irq(up->port.irq, up);