Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'fbdev-for-7.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev fix from Helge Deller:
"Silence build error in au1100fb driver found by kernel test robot"
* tag 'fbdev-for-7.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
fbdev: au1100fb: Fix build on MIPS64
+6
-2
+6
-2
drivers/video/fbdev/au1100fb.c
+6
-2
drivers/video/fbdev/au1100fb.c
···
380
380
#define panel_is_color(panel) (panel->control_base & LCD_CONTROL_PC)
381
381
#define panel_swap_rgb(panel) (panel->control_base & LCD_CONTROL_CCO)
382
382
383
-
#if defined(CONFIG_COMPILE_TEST) && !defined(CONFIG_MIPS)
384
-
/* This is only defined to be able to compile this driver on non-mips platforms */
383
+
#if defined(CONFIG_COMPILE_TEST) && (!defined(CONFIG_MIPS) || defined(CONFIG_64BIT))
384
+
/*
385
+
* KSEG1ADDR() is defined in arch/mips/include/asm/addrspace.h
386
+
* for 32 bit configurations. Provide a stub for compile testing
387
+
* on other platforms.
388
+
*/
385
389
#define KSEG1ADDR(x) (x)
386
390
#endif
387
391