diff --git a/[refs] b/[refs] index a0c51901cf89..3c1a280b4a58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c6d9d0a01d7b51b4d00365c87b05585a83055dd +refs/heads/master: 18a66d5ae982c1e07d67a85e3723a1838caf79f6 diff --git a/trunk/arch/arm/mach-rpc/riscpc.c b/trunk/arch/arm/mach-rpc/riscpc.c index 30baaa8b8a2f..b4db10045ae9 100644 --- a/trunk/arch/arm/mach-rpc/riscpc.c +++ b/trunk/arch/arm/mach-rpc/riscpc.c @@ -152,7 +152,7 @@ static struct platform_device kbd_device = { static struct plat_serial8250_port serial_platform_data[] = { { .mapbase = 0x03010fe0, - .irq = 10, + .irq = IRQ_SERIALPORT, .uartclk = 1843200, .regshift = 2, .iotype = UPIO_MEM,