summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-04-09 19:17:19 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-04-09 19:17:19 -0300
commit88d2f64be52dc30021041fe19e19f59c39549330 (patch)
tree4a36a803fb304826a7136a2ae56af14e6834227c /v4l
parent6f35eb920300b903a0078d2ca191d1ea9cd7a15f (diff)
parent9c3c5a718fce00294e192f6d722db93fd60e0006 (diff)
downloadmediapointer-dvb-s2-88d2f64be52dc30021041fe19e19f59c39549330.tar.gz
mediapointer-dvb-s2-88d2f64be52dc30021041fe19e19f59c39549330.tar.bz2
Merging from master:
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/versions.txt14
1 files changed, 14 insertions, 0 deletions
diff --git a/v4l/versions.txt b/v4l/versions.txt
index c6c0ecd3b..255a31b17 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -10,6 +10,16 @@ VIDEO_PLANB
VIDEO_VINO
VIDEO_M32R_AR_M64278
+[2.6.16]
+VIDEO_USBVIDEO
+USB_VICAM
+USB_IBMCAM
+USB_KONICAWC
+USB_ET61X251
+USB_PWC
+USB_SN9C102
+USB_ZC0301
+
[2.6.14]
VIDEO_ZORAN
VIDEO_ZORAN_BUZ
@@ -66,7 +76,11 @@ RADIO_ZOLTRIX
RADIO_ZOLTRIX_PORT
[2.6.12]
+VIDEO_VIVI
VIDEO_DEV
+VIDEO_V4L1
+VIDEO_V4L2
+VIDEO_V4L1_COMPAT
VIDEO_ADV_DEBUG
VIDEO_BT848
VIDEO_BT848_DVB