diff options
| author | Timur Tabi <timur@freescale.com> | 2012-10-15 09:52:20 +0000 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2012-12-03 22:13:34 +0100 |
| commit | 6baf11906e7687ad517567f6b93b94a90f0db3f9 (patch) | |
| tree | 3f817362bdc3e43eab3202fd3ddd17b5ca69e8c4 /arch/powerpc/platforms/512x/mpc5121_ads.c | |
| parent | 6c27b20395d21235b73771a2bcf5325ece94c4c8 (diff) | |
| download | linux-stable-6baf11906e7687ad517567f6b93b94a90f0db3f9.tar.gz linux-stable-6baf11906e7687ad517567f6b93b94a90f0db3f9.tar.bz2 linux-stable-6baf11906e7687ad517567f6b93b94a90f0db3f9.zip | |
powerpc/512x: don't compile any platform DIU code if the DIU is not enabled
If the DIU framebuffer driver is not enabled, then there's no point in
compiling any platform DIU code, because it will never be used. Most of
the platform code was protected in the appropriate #ifdef, but not all.
This caused a break in some randconfig builds.
This is only a problem on the 512x platforms. The P1022DS and MPC8610HPCD
platforms are already correct.
This patch reverts commit 12e36309f8774f4ccc769d5e3ff11ef092e524bc ("powerpc:
Option FB_FSL_DIU is not really optional for mpc512x") and restores the
ability to configure DIU support.
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'arch/powerpc/platforms/512x/mpc5121_ads.c')
| -rw-r--r-- | arch/powerpc/platforms/512x/mpc5121_ads.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/platforms/512x/mpc5121_ads.c index dcef6ade48e1..0a134e0469ef 100644 --- a/arch/powerpc/platforms/512x/mpc5121_ads.c +++ b/arch/powerpc/platforms/512x/mpc5121_ads.c @@ -42,7 +42,10 @@ static void __init mpc5121_ads_setup_arch(void) for_each_compatible_node(np, "pci", "fsl,mpc5121-pci") mpc83xx_add_bridge(np); #endif + +#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE) mpc512x_setup_diu(); +#endif } static void __init mpc5121_ads_init_IRQ(void) |