diff options
Diffstat (limited to 'drivers/serial/mpc52xx_uart.c')
-rw-r--r-- | drivers/serial/mpc52xx_uart.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 1a88b363005c..8dedb266f143 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
@@ -1298,7 +1298,7 @@ static struct of_device_id mpc52xx_uart_of_match[] = { | |||
1298 | }; | 1298 | }; |
1299 | 1299 | ||
1300 | static int __devinit | 1300 | static int __devinit |
1301 | mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match) | 1301 | mpc52xx_uart_of_probe(struct platform_device *op, const struct of_device_id *match) |
1302 | { | 1302 | { |
1303 | int idx = -1; | 1303 | int idx = -1; |
1304 | unsigned int uartclk; | 1304 | unsigned int uartclk; |
@@ -1369,7 +1369,7 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match) | |||
1369 | } | 1369 | } |
1370 | 1370 | ||
1371 | static int | 1371 | static int |
1372 | mpc52xx_uart_of_remove(struct of_device *op) | 1372 | mpc52xx_uart_of_remove(struct platform_device *op) |
1373 | { | 1373 | { |
1374 | struct uart_port *port = dev_get_drvdata(&op->dev); | 1374 | struct uart_port *port = dev_get_drvdata(&op->dev); |
1375 | dev_set_drvdata(&op->dev, NULL); | 1375 | dev_set_drvdata(&op->dev, NULL); |
@@ -1382,7 +1382,7 @@ mpc52xx_uart_of_remove(struct of_device *op) | |||
1382 | 1382 | ||
1383 | #ifdef CONFIG_PM | 1383 | #ifdef CONFIG_PM |
1384 | static int | 1384 | static int |
1385 | mpc52xx_uart_of_suspend(struct of_device *op, pm_message_t state) | 1385 | mpc52xx_uart_of_suspend(struct platform_device *op, pm_message_t state) |
1386 | { | 1386 | { |
1387 | struct uart_port *port = (struct uart_port *) dev_get_drvdata(&op->dev); | 1387 | struct uart_port *port = (struct uart_port *) dev_get_drvdata(&op->dev); |
1388 | 1388 | ||
@@ -1393,7 +1393,7 @@ mpc52xx_uart_of_suspend(struct of_device *op, pm_message_t state) | |||
1393 | } | 1393 | } |
1394 | 1394 | ||
1395 | static int | 1395 | static int |
1396 | mpc52xx_uart_of_resume(struct of_device *op) | 1396 | mpc52xx_uart_of_resume(struct platform_device *op) |
1397 | { | 1397 | { |
1398 | struct uart_port *port = (struct uart_port *) dev_get_drvdata(&op->dev); | 1398 | struct uart_port *port = (struct uart_port *) dev_get_drvdata(&op->dev); |
1399 | 1399 | ||