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/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 = { | |||
| 1149 | .set_mem_map = m8xx_set_mem_map, | 1149 | .set_mem_map = m8xx_set_mem_map, |
| 1150 | }; | 1150 | }; |
| 1151 | 1151 | ||
| 1152 | static int __init m8xx_probe(struct of_device *ofdev, | 1152 | static int __init m8xx_probe(struct platform_device *ofdev, |
| 1153 | const struct of_device_id *match) | 1153 | const struct of_device_id *match) |
| 1154 | { | 1154 | { |
| 1155 | struct pcmcia_win *w; | 1155 | struct pcmcia_win *w; |
| @@ -1249,7 +1249,7 @@ static int __init m8xx_probe(struct of_device *ofdev, | |||
| 1249 | return 0; | 1249 | return 0; |
| 1250 | } | 1250 | } |
| 1251 | 1251 | ||
| 1252 | static int m8xx_remove(struct of_device *ofdev) | 1252 | static int m8xx_remove(struct platform_device *ofdev) |
| 1253 | { | 1253 | { |
| 1254 | u32 m, i; | 1254 | u32 m, i; |
| 1255 | struct pcmcia_win *w; | 1255 | struct pcmcia_win *w; |