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/edac/ppc4xx_edac.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/edac/ppc4xx_edac.c')
-rw-r--r-- | drivers/edac/ppc4xx_edac.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c index e78839e89a06..070cea41b661 100644 --- a/drivers/edac/ppc4xx_edac.c +++ b/drivers/edac/ppc4xx_edac.c | |||
@@ -184,9 +184,9 @@ struct ppc4xx_ecc_status { | |||
184 | 184 | ||
185 | /* Function Prototypes */ | 185 | /* Function Prototypes */ |
186 | 186 | ||
187 | static int ppc4xx_edac_probe(struct of_device *device, | 187 | static int ppc4xx_edac_probe(struct platform_device *device, |
188 | const struct of_device_id *device_id); | 188 | const struct of_device_id *device_id); |
189 | static int ppc4xx_edac_remove(struct of_device *device); | 189 | static int ppc4xx_edac_remove(struct platform_device *device); |
190 | 190 | ||
191 | /* Global Variables */ | 191 | /* Global Variables */ |
192 | 192 | ||
@@ -1014,7 +1014,7 @@ ppc4xx_edac_init_csrows(struct mem_ctl_info *mci, u32 mcopt1) | |||
1014 | */ | 1014 | */ |
1015 | static int __devinit | 1015 | static int __devinit |
1016 | ppc4xx_edac_mc_init(struct mem_ctl_info *mci, | 1016 | ppc4xx_edac_mc_init(struct mem_ctl_info *mci, |
1017 | struct of_device *op, | 1017 | struct platform_device *op, |
1018 | const struct of_device_id *match, | 1018 | const struct of_device_id *match, |
1019 | const dcr_host_t *dcr_host, | 1019 | const dcr_host_t *dcr_host, |
1020 | u32 mcopt1) | 1020 | u32 mcopt1) |
@@ -1108,7 +1108,7 @@ ppc4xx_edac_mc_init(struct mem_ctl_info *mci, | |||
1108 | * mapped and assigned. | 1108 | * mapped and assigned. |
1109 | */ | 1109 | */ |
1110 | static int __devinit | 1110 | static int __devinit |
1111 | ppc4xx_edac_register_irq(struct of_device *op, struct mem_ctl_info *mci) | 1111 | ppc4xx_edac_register_irq(struct platform_device *op, struct mem_ctl_info *mci) |
1112 | { | 1112 | { |
1113 | int status = 0; | 1113 | int status = 0; |
1114 | int ded_irq, sec_irq; | 1114 | int ded_irq, sec_irq; |
@@ -1238,7 +1238,7 @@ ppc4xx_edac_map_dcrs(const struct device_node *np, dcr_host_t *dcr_host) | |||
1238 | * driver; otherwise, < 0 on error. | 1238 | * driver; otherwise, < 0 on error. |
1239 | */ | 1239 | */ |
1240 | static int __devinit | 1240 | static int __devinit |
1241 | ppc4xx_edac_probe(struct of_device *op, const struct of_device_id *match) | 1241 | ppc4xx_edac_probe(struct platform_device *op, const struct of_device_id *match) |
1242 | { | 1242 | { |
1243 | int status = 0; | 1243 | int status = 0; |
1244 | u32 mcopt1, memcheck; | 1244 | u32 mcopt1, memcheck; |
@@ -1359,7 +1359,7 @@ ppc4xx_edac_probe(struct of_device *op, const struct of_device_id *match) | |||
1359 | * Unconditionally returns 0. | 1359 | * Unconditionally returns 0. |
1360 | */ | 1360 | */ |
1361 | static int | 1361 | static int |
1362 | ppc4xx_edac_remove(struct of_device *op) | 1362 | ppc4xx_edac_remove(struct platform_device *op) |
1363 | { | 1363 | { |
1364 | struct mem_ctl_info *mci = dev_get_drvdata(&op->dev); | 1364 | struct mem_ctl_info *mci = dev_get_drvdata(&op->dev); |
1365 | struct ppc4xx_edac_pdata *pdata = mci->pvt_info; | 1365 | struct ppc4xx_edac_pdata *pdata = mci->pvt_info; |