Merge remote-tracking branch 'jwb/next' into next

This commit is contained in:
Benjamin Herrenschmidt 2011-08-30 15:14:46 +10:00
commit 9bb7361d99
13 changed files with 294 additions and 339 deletions

View file

@ -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,
},
};