diff --git a/[refs] b/[refs] index df5c595183c5..4f49b7701239 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f85449ffd146cf2b91a47dff694281bcfd2558b +refs/heads/master: bf538fe4689694b0b90d358dda91cde7b438097d diff --git a/trunk/drivers/serial/8250_pci.c b/trunk/drivers/serial/8250_pci.c index 5b0e80da1c44..7ddff3f55087 100644 --- a/trunk/drivers/serial/8250_pci.c +++ b/trunk/drivers/serial/8250_pci.c @@ -728,7 +728,8 @@ static int pci_ni8430_init(struct pci_dev *dev) #define NI8430_PORTCON_TXVR_ENABLE (1 << 3) static int -pci_ni8430_setup(struct serial_private *priv, struct pciserial_board *board, +pci_ni8430_setup(struct serial_private *priv, + const struct pciserial_board *board, struct uart_port *port, int idx) { void __iomem *p;