diff options
| author | Timur Tabi <timur@freescale.com> | 2012-10-15 13:52:20 +0400 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2012-12-04 01:13:34 +0400 |
| commit | 6baf11906e7687ad517567f6b93b94a90f0db3f9 (patch) | |
| tree | 3f817362bdc3e43eab3202fd3ddd17b5ca69e8c4 /arch/powerpc/platforms/512x/mpc512x.h | |
| parent | 6c27b20395d21235b73771a2bcf5325ece94c4c8 (diff) | |
| download | linux-6baf11906e7687ad517567f6b93b94a90f0db3f9.tar.xz | |
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/mpc512x.h')
| -rw-r--r-- | arch/powerpc/platforms/512x/mpc512x.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/512x/mpc512x.h b/arch/powerpc/platforms/512x/mpc512x.h index 1ab6d11d0b19..c32b399eb952 100644 --- a/arch/powerpc/platforms/512x/mpc512x.h +++ b/arch/powerpc/platforms/512x/mpc512x.h @@ -16,6 +16,13 @@ extern void __init mpc512x_init(void); extern int __init mpc5121_clk_init(void); void __init mpc512x_declare_of_platform_devices(void); extern void mpc512x_restart(char *cmd); -extern void mpc512x_init_diu(void); -extern void mpc512x_setup_diu(void); + +#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE) +void mpc512x_init_diu(void); +void mpc512x_setup_diu(void); +#else +#define mpc512x_init_diu NULL +#define mpc512x_setup_diu NULL +#endif + #endif /* __MPC512X_H__ */ |