diff options
author | David S. Miller <davem@davemloft.net> | 2012-10-09 19:14:32 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-10-09 19:14:32 +0200 |
commit | 8dd9117cc7a021ced1c5cf177e2d44dd92b88617 (patch) | |
tree | cad990f58f9ec6d400226dda86718fc10781416e /drivers/media/i2c/m5mols/Kconfig | |
parent | e1000e: add device IDs for i218 (diff) | |
parent | Fix staging driver use of VM_RESERVED (diff) | |
download | linux-8dd9117cc7a021ced1c5cf177e2d44dd92b88617.tar.xz linux-8dd9117cc7a021ced1c5cf177e2d44dd92b88617.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Pulled mainline in order to get the UAPI infrastructure already
merged before I pull in David Howells's UAPI trees for networking.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/media/i2c/m5mols/Kconfig')
-rw-r--r-- | drivers/media/i2c/m5mols/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/i2c/m5mols/Kconfig b/drivers/media/i2c/m5mols/Kconfig new file mode 100644 index 000000000000..dc8c2505907e --- /dev/null +++ b/drivers/media/i2c/m5mols/Kconfig @@ -0,0 +1,6 @@ +config VIDEO_M5MOLS + tristate "Fujitsu M-5MOLS 8MP sensor support" + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on MEDIA_CAMERA_SUPPORT + ---help--- + This driver supports Fujitsu M-5MOLS camera sensor with ISP |