From 24bda047c0558518cdd4845894af9a62fe0cfe36 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 11 Apr 2006 17:55:53 -0300 Subject: Merge: from V4L1 tree From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- v4l/versions.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'v4l') 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 -- cgit v1.2.3