From: Michael Ellerman Date: Fri, 21 Aug 2020 10:49:10 +0000 (+1000) Subject: video: fbdev: controlfb: Fix build for COMPILE_TEST=y && PPC_PMAC=n X-Git-Tag: v5.10.7~1642^2~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d618b9f3fcab84e9ec28c180de46fb2c929d096;p=platform%2Fkernel%2Flinux-rpi.git video: fbdev: controlfb: Fix build for COMPILE_TEST=y && PPC_PMAC=n The build is currently broken, if COMPILE_TEST=y and PPC_PMAC=n: linux/drivers/video/fbdev/controlfb.c: In function ‘control_set_hardware’: linux/drivers/video/fbdev/controlfb.c:276:2: error: implicit declaration of function ‘btext_update_display’ 276 | btext_update_display(p->frame_buffer_phys + CTRLFB_OFF, | ^~~~~~~~~~~~~~~~~~~~ Fix it by including btext.h whenever CONFIG_BOOTX_TEXT is enabled. Fixes: a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support") Signed-off-by: Michael Ellerman Acked-by: Bartlomiej Zolnierkiewicz Link: https://lore.kernel.org/r/20200821104910.3363818-1-mpe@ellerman.id.au --- diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c index 9c4f1be..547abeb 100644 --- a/drivers/video/fbdev/controlfb.c +++ b/drivers/video/fbdev/controlfb.c @@ -49,6 +49,8 @@ #include #ifdef CONFIG_PPC_PMAC #include +#endif +#ifdef CONFIG_BOOTX_TEXT #include #endif