Skip to content

Commit 05c9090

Browse files
committed
media: davinci: allow build vpbe_display with COMPILE_TEST
Except for some includes (with doesn't seem to be used), this driver builds fine with COMPILE_TEST. So, add checks there to avoid building it if ARCH_DAVINCI is not selected. Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent b8952ee commit 05c9090

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

drivers/media/platform/davinci/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ config VIDEO_DM365_ISIF
8282

8383
config VIDEO_DAVINCI_VPBE_DISPLAY
8484
tristate "TI DaVinci VPBE V4L2-Display driver"
85-
depends on VIDEO_V4L2 && ARCH_DAVINCI
85+
depends on VIDEO_V4L2
86+
depends on ARCH_DAVINCI || COMPILE_TEST
8687
depends on HAS_DMA
8788
depends on I2C
8889
select VIDEOBUF2_DMA_CONTIG

drivers/media/platform/davinci/vpbe_display.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
#include <linux/slab.h>
2727

2828
#include <asm/pgtable.h>
29+
30+
#ifdef CONFIG_ARCH_DAVINCI
2931
#include <mach/cputype.h>
32+
#endif
3033

3134
#include <media/v4l2-dev.h>
3235
#include <media/v4l2-common.h>

drivers/media/platform/davinci/vpbe_osd.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
#include <linux/clk.h>
2525
#include <linux/slab.h>
2626

27+
#ifdef CONFIG_ARCH_DAVINCI
2728
#include <mach/cputype.h>
2829
#include <mach/hardware.h>
30+
#endif
2931

3032
#include <media/davinci/vpss.h>
3133
#include <media/v4l2-device.h>

drivers/media/platform/davinci/vpbe_venc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@
2121
#include <linux/videodev2.h>
2222
#include <linux/slab.h>
2323

24+
#ifdef CONFIG_ARCH_DAVINCI
2425
#include <mach/hardware.h>
2526
#include <mach/mux.h>
27+
#endif
28+
2629
#include <linux/platform_data/i2c-davinci.h>
2730

2831
#include <linux/io.h>

0 commit comments

Comments
 (0)