X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fserial%2Ficom.c;h=71e6a24d8c28f18b8c6420ca5ffab0fef011651d;hb=d39c9400ae0d60aaaf534b1ad860a9bc1413d8af;hp=8aa0f641866b3622338b21542e9638ce3a101e26;hpb=44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3;p=powerpc.git

diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index 8aa0f64186..71e6a24d8c 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -1087,8 +1087,8 @@ static void icom_close(struct uart_port *port)
 }
 
 static void icom_set_termios(struct uart_port *port,
-			     struct termios *termios,
-			     struct termios *old_termios)
+			     struct ktermios *termios,
+			     struct ktermios *old_termios)
 {
 	int baud;
 	unsigned cflag, iflag;
@@ -1510,7 +1510,7 @@ static int __devinit icom_probe(struct pci_dev *dev,
 	}
 
 	if ( (retval = pci_request_regions(dev, "icom"))) {
-		 dev_err(&dev->dev, "pci_request_region FAILED\n");
+		 dev_err(&dev->dev, "pci_request_regions FAILED\n");
 		 pci_disable_device(dev);
 		 return retval;
 	 }