diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-22 10:02:17 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-22 10:02:17 +1100 |
| commit | d9df01763e74fc8b1e60ce7c03c7bacf01abc34c (patch) | |
| tree | 2af58b4b797c298f7c50bb543bcaeaa77260e43f /drivers/video | |
| parent | 5a4f7afeb0b9a40bb75b59e37a42892244164780 (diff) | |
| parent | d24720a45ad2928f687c6371482cdfba19b74fc5 (diff) | |
Merge remote branch '52xx-and-virtex/next'
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fsl-diu-fb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c index 72d68b3dc478..4637bcbe03a4 100644 --- a/drivers/video/fsl-diu-fb.c +++ b/drivers/video/fsl-diu-fb.c @@ -1633,6 +1633,11 @@ static int __init fsl_diu_setup(char *options) #endif static struct of_device_id fsl_diu_match[] = { +#ifdef CONFIG_PPC_MPC512x + { + .compatible = "fsl,mpc5121-diu", + }, +#endif { .compatible = "fsl,diu", }, |