diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /drivers/serial/apbuart.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/serial/apbuart.c')
| -rw-r--r-- | drivers/serial/apbuart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/apbuart.c b/drivers/serial/apbuart.c index 0099b8692b60..cc01c650a144 100644 --- a/drivers/serial/apbuart.c +++ b/drivers/serial/apbuart.c | |||
| @@ -551,7 +551,7 @@ static struct uart_driver grlib_apbuart_driver = { | |||
| 551 | /* OF Platform Driver */ | 551 | /* OF Platform Driver */ |
| 552 | /* ======================================================================== */ | 552 | /* ======================================================================== */ |
| 553 | 553 | ||
| 554 | static int __devinit apbuart_probe(struct of_device *op, | 554 | static int __devinit apbuart_probe(struct platform_device *op, |
| 555 | const struct of_device_id *match) | 555 | const struct of_device_id *match) |
| 556 | { | 556 | { |
| 557 | int i = -1; | 557 | int i = -1; |