diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
| commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
| tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /drivers/serial/apbuart.c | |
| parent | 26f0cf91813bdc8e61595f8ad6660251e2ee9cf6 (diff) | |
| parent | fbe0f8348fd6c3d016a3f48756eb729b41a67c22 (diff) | |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
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; |