summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2018-04-20 11:55:13 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-05-05 11:41:58 -0400
commit6159e12e11770fb25e748af90f6c5206c1df09ee (patch)
tree3d92733b1857ad4ded93ca3e42f3e57762cebbe7
parent51d4fd2b87e0d01f88b3b74e1cf312fc66446708 (diff)
downloadlinux-6159e12e11770fb25e748af90f6c5206c1df09ee.tar.gz
linux-6159e12e11770fb25e748af90f6c5206c1df09ee.tar.bz2
linux-6159e12e11770fb25e748af90f6c5206c1df09ee.zip
media: meye: allow building it with COMPILE_TEST on non-x86
This driver depends on sony-laptop driver, but this is available only for x86. So, add a stub function, in order to allow building it on non-x86 too. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--drivers/media/pci/meye/Kconfig3
-rw-r--r--include/linux/sony-laptop.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/pci/meye/Kconfig b/drivers/media/pci/meye/Kconfig
index b4bf848be5a0..2e60334ffef5 100644
--- a/drivers/media/pci/meye/Kconfig
+++ b/drivers/media/pci/meye/Kconfig
@@ -1,6 +1,7 @@
config VIDEO_MEYE
tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
- depends on PCI && SONY_LAPTOP && VIDEO_V4L2
+ depends on PCI && VIDEO_V4L2
+ depends on SONY_LAPTOP || COMPILE_TEST
---help---
This is the video4linux driver for the Motion Eye camera found
in the Vaio Picturebook laptops. Please read the material in
diff --git a/include/linux/sony-laptop.h b/include/linux/sony-laptop.h
index 1a4b77317fa1..374d0fdb0743 100644
--- a/include/linux/sony-laptop.h
+++ b/include/linux/sony-laptop.h
@@ -28,7 +28,11 @@
#define SONY_PIC_COMMAND_GETCAMERAROMVERSION 18 /* obsolete */
#define SONY_PIC_COMMAND_GETCAMERAREVISION 19 /* obsolete */
+#if IS_ENABLED(CONFIG_SONY_LAPTOP)
int sony_pic_camera_command(int command, u8 value);
+#else
+static inline int sony_pic_camera_command(int command, u8 value) { return 0; };
+#endif
#endif /* __KERNEL__ */