summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorIsmael Luceno <ismael.luceno@corp.bluecherry.net>2014-05-18 20:23:47 -0300
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:59:34 +0900
commita2fbbda28fcd4b2360bdfecfb625442d62a1a27c (patch)
treee287b194725fe5649641f71fbb467d39688296dc /drivers/staging
parent9b55e62cbce889910776b75b9980d34802aab104 (diff)
downloadlinux-3.10-a2fbbda28fcd4b2360bdfecfb625442d62a1a27c.tar.gz
linux-3.10-a2fbbda28fcd4b2360bdfecfb625442d62a1a27c.tar.bz2
linux-3.10-a2fbbda28fcd4b2360bdfecfb625442d62a1a27c.zip
upstream: [media] solo6x10: Kconfig: Add supported card list to the SOLO6X10 knob
Explicitly list the cards supported by and tested with this driver. Signed-off-by: Ismael Luceno <ismael.luceno@corp.bluecherry.net> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/media/solo6x10/Kconfig12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/staging/media/solo6x10/Kconfig b/drivers/staging/media/solo6x10/Kconfig
index 34f3b6d02d2..bfb31d2855c 100644
--- a/drivers/staging/media/solo6x10/Kconfig
+++ b/drivers/staging/media/solo6x10/Kconfig
@@ -1,5 +1,5 @@
config SOLO6X10
- tristate "Softlogic 6x10 MPEG codec cards"
+ tristate "Bluecherry / Softlogic 6x10 capture cards (MPEG-4/H.264)"
depends on PCI && VIDEO_DEV && SND && I2C
depends on FONTS
select VIDEOBUF2_DMA_SG
@@ -7,5 +7,11 @@ config SOLO6X10
select SND_PCM
select FONT_8x16
---help---
- This driver supports the Softlogic based MPEG-4 and h.264 codec
- cards.
+ This driver supports the Bluecherry H.264 and MPEG-4 hardware
+ compression capture cards and other Softlogic-based ones.
+
+ Following cards have been tested:
+ * Bluecherry BC-H16480A (PCIe, 16 port, H.264)
+ * Bluecherry BC-H04120A (PCIe, 4 port, H.264)
+ * Bluecherry BC-H04120A-MPCI (Mini-PCI, 4 port, H.264)
+ * Bluecherry BC-04120A (PCIe, 4 port, MPEG-4)