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/spi/mpc512x_psc_spi.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/spi/mpc512x_psc_spi.c')
| -rw-r--r-- | drivers/spi/mpc512x_psc_spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/mpc512x_psc_spi.c b/drivers/spi/mpc512x_psc_spi.c index 10baac3f8ea5..cddbfceb324f 100644 --- a/drivers/spi/mpc512x_psc_spi.c +++ b/drivers/spi/mpc512x_psc_spi.c | |||
| @@ -507,7 +507,7 @@ static int __exit mpc512x_psc_spi_do_remove(struct device *dev) | |||
| 507 | return 0; | 507 | return 0; |
| 508 | } | 508 | } |
| 509 | 509 | ||
| 510 | static int __init mpc512x_psc_spi_of_probe(struct of_device *op, | 510 | static int __init mpc512x_psc_spi_of_probe(struct platform_device *op, |
| 511 | const struct of_device_id *match) | 511 | const struct of_device_id *match) |
| 512 | { | 512 | { |
| 513 | const u32 *regaddr_p; | 513 | const u32 *regaddr_p; |
| @@ -539,7 +539,7 @@ static int __init mpc512x_psc_spi_of_probe(struct of_device *op, | |||
| 539 | irq_of_parse_and_map(op->dev.of_node, 0), id); | 539 | irq_of_parse_and_map(op->dev.of_node, 0), id); |
| 540 | } | 540 | } |
| 541 | 541 | ||
| 542 | static int __exit mpc512x_psc_spi_of_remove(struct of_device *op) | 542 | static int __exit mpc512x_psc_spi_of_remove(struct platform_device *op) |
| 543 | { | 543 | { |
| 544 | return mpc512x_psc_spi_do_remove(&op->dev); | 544 | return mpc512x_psc_spi_do_remove(&op->dev); |
| 545 | } | 545 | } |