diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-06-01 12:42:12 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-06-01 12:42:12 +0200 |
| commit | b4ca761577535b2b4d153689ee97342797dfff05 (patch) | |
| tree | 29054d55508f1faa22ec32acf7c245751af03348 /drivers/edac/ppc4xx_edac.c | |
| parent | 28f4197e5d4707311febeec8a0eb97cb5fd93c97 (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
| download | blackbird-op-linux-b4ca761577535b2b4d153689ee97342797dfff05.tar.gz blackbird-op-linux-b4ca761577535b2b4d153689ee97342797dfff05.zip | |
Merge branch 'master' into for-linus
Conflicts:
fs/pipe.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/edac/ppc4xx_edac.c')
| -rw-r--r-- | drivers/edac/ppc4xx_edac.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c index 11f2172aa1e6..9d6f6783328c 100644 --- a/drivers/edac/ppc4xx_edac.c +++ b/drivers/edac/ppc4xx_edac.c @@ -202,13 +202,13 @@ static struct of_device_id ppc4xx_edac_match[] = { }; static struct of_platform_driver ppc4xx_edac_driver = { - .match_table = ppc4xx_edac_match, .probe = ppc4xx_edac_probe, .remove = ppc4xx_edac_remove, - .driver = { - .owner = THIS_MODULE, - .name = PPC4XX_EDAC_MODULE_NAME - } + .driver = { + .owner = THIS_MODULE, + .name = PPC4XX_EDAC_MODULE_NAME + .of_match_table = ppc4xx_edac_match, + }, }; /* |
