diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-08-30 01:14:46 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-08-30 01:14:46 -0400 |
| commit | 9bb7361d99fb5c510e62b521e4292581fa1bee98 (patch) | |
| tree | f9a4797a2e97006947011fcdbf8677a84fbdf182 /drivers | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
| parent | 9fcd768d0cc88b41ea459e25d2db12d3e25fa9dd (diff) | |
Merge remote-tracking branch 'jwb/next' into next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/edac/ppc4xx_edac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c index 0de7d8770891..38400963e245 100644 --- a/drivers/edac/ppc4xx_edac.c +++ b/drivers/edac/ppc4xx_edac.c | |||
| @@ -205,7 +205,7 @@ static struct platform_driver ppc4xx_edac_driver = { | |||
| 205 | .remove = ppc4xx_edac_remove, | 205 | .remove = ppc4xx_edac_remove, |
| 206 | .driver = { | 206 | .driver = { |
| 207 | .owner = THIS_MODULE, | 207 | .owner = THIS_MODULE, |
| 208 | .name = PPC4XX_EDAC_MODULE_NAME | 208 | .name = PPC4XX_EDAC_MODULE_NAME, |
| 209 | .of_match_table = ppc4xx_edac_match, | 209 | .of_match_table = ppc4xx_edac_match, |
| 210 | }, | 210 | }, |
| 211 | }; | 211 | }; |