diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-08-21 12:49:10 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-08-27 09:40:50 +0200 |
| commit | 4d618b9f3fcab84e9ec28c180de46fb2c929d096 (patch) | |
| tree | 87da8390d83451753d8919a93e090de9070550a2 /drivers/video/fbdev/controlfb.c | |
| parent | selftests/powerpc: Update PROT_SAO test to skip ISA 3.1 (diff) | |
| download | linux-4d618b9f3fcab84e9ec28c180de46fb2c929d096.tar.xz linux-4d618b9f3fcab84e9ec28c180de46fb2c929d096.zip | |
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 <mpe@ellerman.id.au>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Link: https://lore.kernel.org/r/20200821104910.3363818-1-mpe@ellerman.id.au
Diffstat (limited to 'drivers/video/fbdev/controlfb.c')
| -rw-r--r-- | drivers/video/fbdev/controlfb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c index 9c4f1be856ec..547abeb39f87 100644 --- a/drivers/video/fbdev/controlfb.c +++ b/drivers/video/fbdev/controlfb.c @@ -49,6 +49,8 @@ #include <linux/cuda.h> #ifdef CONFIG_PPC_PMAC #include <asm/prom.h> +#endif +#ifdef CONFIG_BOOTX_TEXT #include <asm/btext.h> #endif |