diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-24 16:00:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-24 16:00:37 -0500 |
| commit | d3c7e1ab043abd7706db4fbccf327df9e62f7990 (patch) | |
| tree | 793aec926c57da1e364e04163199262364c627b0 /drivers/spi/mpc52xx_spi.c | |
| parent | dfe80f63293ece364795c2e87805882c9ec3a266 (diff) | |
| parent | 4bdac7da5237170b1392f39ebee99d235043fad8 (diff) | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6:
spi/mpc52xx-spi: fix annotation for remove()-pointer
spi/fsl_espi: fix wrong setting of the address in the command buffer
spi/fsl_espi: change the read behaviour of the SPIRF
of/i2c: Fix request module by alias
powerpc/mpc5200: include fs.h in mpc52xx_gpt.c
Diffstat (limited to 'drivers/spi/mpc52xx_spi.c')
| -rw-r--r-- | drivers/spi/mpc52xx_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/mpc52xx_spi.c b/drivers/spi/mpc52xx_spi.c index ec9f0b1bf864..84439f655601 100644 --- a/drivers/spi/mpc52xx_spi.c +++ b/drivers/spi/mpc52xx_spi.c | |||
| @@ -563,7 +563,7 @@ static struct of_platform_driver mpc52xx_spi_of_driver = { | |||
| 563 | .of_match_table = mpc52xx_spi_match, | 563 | .of_match_table = mpc52xx_spi_match, |
| 564 | }, | 564 | }, |
| 565 | .probe = mpc52xx_spi_probe, | 565 | .probe = mpc52xx_spi_probe, |
| 566 | .remove = __exit_p(mpc52xx_spi_remove), | 566 | .remove = __devexit_p(mpc52xx_spi_remove), |
| 567 | }; | 567 | }; |
| 568 | 568 | ||
| 569 | static int __init mpc52xx_spi_init(void) | 569 | static int __init mpc52xx_spi_init(void) |