diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 09:11:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 09:11:31 -0700 |
| commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
| tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /drivers/pcmcia/m8xx_pcmcia.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/pcmcia/m8xx_pcmcia.c')
| -rw-r--r-- | drivers/pcmcia/m8xx_pcmcia.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index f2f90a7d3e12..f0ecad99ce81 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c @@ -1149,7 +1149,7 @@ static struct pccard_operations m8xx_services = { .set_mem_map = m8xx_set_mem_map, }; -static int __init m8xx_probe(struct of_device *ofdev, +static int __init m8xx_probe(struct platform_device *ofdev, const struct of_device_id *match) { struct pcmcia_win *w; @@ -1249,7 +1249,7 @@ static int __init m8xx_probe(struct of_device *ofdev, return 0; } -static int m8xx_remove(struct of_device *ofdev) +static int m8xx_remove(struct platform_device *ofdev) { u32 m, i; struct pcmcia_win *w; |