diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-02-19 12:51:39 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-02-19 12:51:39 -0500 |
commit | 877d66856e9de4a6d1ffbf61bec6f830bde4d3bf (patch) | |
tree | 61249ed3466942867666af42c44044ff1e83fdc5 /arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | |
parent | db8ff907027b63b02c8cef385ea95445b7a41357 (diff) | |
parent | 12c7e8f62de546bff9f8ffa5a03e0ad292bcf17d (diff) |
Merge remote-tracking branch 'kumar/next' into next
<<
Mostly misc code cleanups in various board ports and adding support for a
new MPC85xx board - ppa8548.
>>
Diffstat (limited to 'arch/powerpc/sysdev/fsl_85xx_l2ctlr.c')
-rw-r--r-- | arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c index 8cf93f029e17..afc2dbf37011 100644 --- a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c +++ b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | |||
@@ -203,6 +203,7 @@ static struct of_device_id mpc85xx_l2ctlr_of_match[] = { | |||
203 | { .compatible = "fsl,p1024-l2-cache-controller",}, | 203 | { .compatible = "fsl,p1024-l2-cache-controller",}, |
204 | { .compatible = "fsl,p1015-l2-cache-controller",}, | 204 | { .compatible = "fsl,p1015-l2-cache-controller",}, |
205 | { .compatible = "fsl,p1010-l2-cache-controller",}, | 205 | { .compatible = "fsl,p1010-l2-cache-controller",}, |
206 | { .compatible = "fsl,bsc9131-l2-cache-controller",}, | ||
206 | {}, | 207 | {}, |
207 | }; | 208 | }; |
208 | 209 | ||