diff --git a/[refs] b/[refs] index ebb0f3cd86c0..2e54e37e512d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37f1e984253c7eeee8e0f2be9d134d1e9e34b9d4 +refs/heads/master: a30ff2e348af9d3a1782103130c88960550a773f diff --git a/trunk/drivers/serial/mpsc.c b/trunk/drivers/serial/mpsc.c index 0ca83ac31d07..ba30e2363cc0 100644 --- a/trunk/drivers/serial/mpsc.c +++ b/trunk/drivers/serial/mpsc.c @@ -1165,7 +1165,7 @@ mpsc_startup(struct uart_port *port) flag = SA_SHIRQ; if (request_irq(pi->port.irq, mpsc_sdma_intr, flag, - "mpsc/sdma", pi)) + "mpsc-sdma", pi)) printk(KERN_ERR "MPSC: Can't get SDMA IRQ %d\n", pi->port.irq);