Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 598041f3 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

video: fbdev: via: allow COMPILE_TEST build 



This patch allows viafb driver to be build on !X86 archs
using COMPILE_TEST config option.

Since via-camera driver (VIDEO_VIA_CAMERA) depends on viafb
it also needs a little fixup.

Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 187a6035

drivers/media/platform/via-camera.c

+5 −0
Original line number Diff line number Diff line
@@ -27,7 +27,12 @@ 
#include <linux/via-core.h>

#include <linux/via-gpio.h>

#include <linux/via_i2c.h>



#ifdef CONFIG_X86

#include <asm/olpc.h>

#else

#define machine_is_olpc(x) 0

#endif



#include "via-camera.h"

drivers/video/fbdev/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1437,7 +1437,7 @@ config FB_SIS_315 


config FB_VIA

       tristate "VIA UniChrome (Pro) and Chrome9 display support"

       depends on FB && PCI && X86 && GPIOLIB && I2C

       depends on FB && PCI && GPIOLIB && I2C && (X86 || COMPILE_TEST)

       select FB_CFB_FILLRECT

       select FB_CFB_COPYAREA

       select FB_CFB_IMAGEBLIT

drivers/video/fbdev/via/global.h

+6 −0
Original line number Diff line number Diff line
@@ -33,6 +33,12 @@ 
#include <linux/console.h>

#include <linux/timer.h>



#ifdef CONFIG_X86

#include <asm/olpc.h>

#else

#define machine_is_olpc(x) 0

#endif



#include "debug.h"



#include "viafbdev.h"

drivers/video/fbdev/via/hw.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
 */



#include <linux/via-core.h>

#include <asm/olpc.h>

#include "global.h"

#include "via_clock.h"

drivers/video/fbdev/via/via-core.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/platform_device.h>

#include <linux/list.h>

#include <linux/pm.h>

#include <asm/olpc.h>



/*

 * The default port config.