summaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-08-30 15:14:46 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-08-30 15:14:46 +1000
commit9bb7361d99fb5c510e62b521e4292581fa1bee98 (patch)
treef9a4797a2e97006947011fcdbf8677a84fbdf182 /drivers/edac
parentc6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff)
parent9fcd768d0cc88b41ea459e25d2db12d3e25fa9dd (diff)
Merge remote-tracking branch 'jwb/next' into next
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/ppc4xx_edac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index 0de7d877089..38400963e24 100644
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
@@ -205,7 +205,7 @@ static struct platform_driver ppc4xx_edac_driver = {
.remove = ppc4xx_edac_remove,
.driver = {
.owner = THIS_MODULE,
- .name = PPC4XX_EDAC_MODULE_NAME
+ .name = PPC4XX_EDAC_MODULE_NAME,
.of_match_table = ppc4xx_edac_match,
},
};