rpms/kernel/devel kernel.spec, 1.1404, 1.1405 linux-2.6-v4l-dvb-fixes.patch, 1.3, 1.4 linux-2.6-v4l-dvb-update.patch, 1.5, 1.6
Mauro Carvalho Chehab
mchehab at fedoraproject.org
Tue Mar 10 15:12:53 UTC 2009
Author: mchehab
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32698
Modified Files:
kernel.spec linux-2.6-v4l-dvb-fixes.patch
linux-2.6-v4l-dvb-update.patch
Log Message:
Update v4l/dvb drivers with the linux-next patches
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1404
retrieving revision 1.1405
diff -u -r1.1404 -r1.1405
--- kernel.spec 10 Mar 2009 08:15:05 -0000 1.1404
+++ kernel.spec 10 Mar 2009 15:12:16 -0000 1.1405
@@ -1810,6 +1810,9 @@
# and build.
%changelog
+* Tue Mar 10 2009 Mauro Carvalho Cheahb <mchehab at redhat.com>
+- updates V4L/DVB from linux-next and adds git log summary on patches
+
* Tue Mar 10 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: more kms fixes/cleanups
- now works decently on all the G8x chips I have
linux-2.6-v4l-dvb-fixes.patch:
Index: linux-2.6-v4l-dvb-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-v4l-dvb-fixes.patch 6 Mar 2009 01:45:03 -0000 1.3
+++ linux-2.6-v4l-dvb-fixes.patch 10 Mar 2009 15:12:17 -0000 1.4
@@ -1,3 +1,12 @@
+Gregory Lardiere (1):
+ V4L/DVB (10789): m5602-s5k4aa: Split up the initial sensor probe in chunks.
+
+Mauro Carvalho Chehab (1):
+ V4L/DVB (10834): zoran: auto-select bt866 for AverMedia 6 Eyes
+
+Vitaly Wool (1):
+ V4L/DVB (10832): tvaudio: Avoid breakage with tda9874a
+
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
index e564a61..48892b5 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
linux-2.6-v4l-dvb-update.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 linux-2.6-v4l-dvb-update.patch
Index: linux-2.6-v4l-dvb-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-update.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-v4l-dvb-update.patch 6 Mar 2009 11:45:21 -0000 1.5
+++ linux-2.6-v4l-dvb-update.patch 10 Mar 2009 15:12:17 -0000 1.6
@@ -1,9 +1,566 @@
+Abylay Ospan (3):
+ V4L/DVB (10796): Add init code for NetUP Dual DVB-S2 CI card
+ V4L/DVB (10797): Add EEPROM code for NetUP Dual DVB-S2 CI card.
+ V4L/DVB (10798): Add CIMax(R) SP2 Common Interface code for NetUP Dual DVB-S2 CI card
+
+Adam Baker (2):
+ V4L/DVB (10639): gspca - sq905: New subdriver.
+ V4L/DVB (10829): Support alternate resolutions for sq905
+
+Alexey Klimov (16):
+ V4L/DVB (10316): v4l/dvb: use usb_make_path in usb-radio drivers
+ V4L/DVB (10324): em28xx: Correct mailing list
+ V4L/DVB (10335): gspca - all subdrivers: Fix CodingStyle in sd_mod_init function.
+ V4L/DVB (10336): gspca - all subdrivers: Return ret instead of -1 in sd_mod_init.
+ V4L/DVB (10455): radio-mr800: codingstyle cleanups
+ V4L/DVB (10456): radio-mr800: place dev_err instead of dev_warn
+ V4L/DVB (10457): radio-mr800: add more dev_err messages in probe
+ V4L/DVB (10458): radio-mr800: move radio start and stop in one function
+ V4L/DVB (10459): radio-mr800: fix amradio_set_freq
+ V4L/DVB (10460): radio-mr800: add stereo support
+ V4L/DVB (10461): radio-mr800: add few lost mutex locks
+ V4L/DVB (10462): radio-mr800: increase version and add comments
+ V4L/DVB (10463): radio-mr800: fix checking of retval after usb_bulk_msg
+ V4L/DVB (10464): radio-si470x: use usb_make_path in usb-radio drivers
+ V4L/DVB (10465): dsbr100: Add few lost mutex locks.
+ V4L/DVB (10522): em28xx-audio: replace printk with em28xx_errdev
+
+Andy Walls (40):
+ V4L/DVB (10274): cx18: Fix a PLL divisor update for the I2S master clock
+ V4L/DVB (10275): cx18: Additional debug to display outgoing mailbox parameters
+ V4L/DVB (10276): cx18, cx2341x, ivtv: Add AC-3 audio encoding control to cx18
+ V4L/DVB (10277): cx18, cx2341x: Fix bugs in cx18 AC3 control and comply with V4L2 spec
+ V4L/DVB (10278): cx18: Fix bad audio in first analog capture.
+ V4L/DVB (10279): cx18: Print driver version number when logging status
+ V4L/DVB (10280): cx18: Rename structure members: dev to pci_dev and v4l2dev to video_dev
+ V4L/DVB (10281): cx18: Conversion to new V4L2 framework: use v4l2_device object
+ V4L/DVB (10283): cx18: Call request_module() with proper argument types.
+ V4L/DVB (10284): cx18: Add initial entry for a Leadtek DVR3100 H hybrid card
+ V4L/DVB (10433): cx18: Defer A/V core initialization until a valid cx18_av_cmd arrives
+ V4L/DVB (10434): cx18: Smarter verification of CX18_AUDIO_ENABLE register writes
+ V4L/DVB (10435): cx18: Normalize APU after second APU firmware load
+ V4L/DVB (10436): cx18: Fix coding style of a switch statement per checkpatch.pl
+ V4L/DVB (10437): cx18: Remove an unused spinlock
+ V4L/DVB (10439): cx18: Clean-up and enable sliced VBI handling
+ V4L/DVB (10440): cx18: Fix presentation timestamp (PTS) for VBI buffers
+ V4L/DVB (10441): cx18: Fix VBI ioctl() handling and Raw/Sliced VBI state management
+ V4L/DVB (10442): cx18: Fixes for enforcing when Encoder Raw VBI params can be set
+ V4L/DVB (10443): cx18: Use correct line counts per field in firmware API call
+ V4L/DVB (10444): cx18: Fix sliced VBI PTS and fix artifacts in last raw line of field
+ V4L/DVB (10445): cx18: Process Raw VBI on a whole frame basis; fix VBI buffer size
+ V4L/DVB (10446): cx18: Finally get sliced VBI working - for 525 line 60 Hz systems at least
+ V4L/DVB (10755): cx18: Convert the integrated A/V decoder core interface to a v4l2_subdev
+ V4L/DVB (10756): cx18: Slim down instance handling, build names from v4l2_device.name
+ V4L/DVB (10757): cx18, v4l2-chip-ident: Finish conversion of AV decoder core to v4l2_subdev
+ V4L/DVB (10758): cx18: Convert I2C devices to v4l2_subdevices
+ V4L/DVB (10759): cx18: Convert GPIO connected functions to act as v4l2_subdevices
+ V4L/DVB (10760): cx18: Fix a memory leak of buffers used for sliced VBI insertion
+ V4L/DVB (10761): cx18: Change log lines for internal subdevs and fix tveeprom reads
+ V4L/DVB (10762): cx18: Get rid of unused variables related to video output
+ V4L/DVB (10763): cx18: Increment version number due to significant changes for v4l2_subdevs
+ V4L/DVB (10764): cx18: Disable AC3 controls as the firmware doesn't support AC3
+ V4L/DVB (10850): cx18: Use strlcpy() instead of strncpy() for temp eeprom i2c_client setup
+ V4L/DVB (10851): cx18: Fix a video scaling check problem introduced by sliced VBI changes
+ V4L/DVB (10852): cx18: Include cx18-audio.h in cx18-audio.c to eliminate s-parse warning
+ V4L/DVB (10853): cx18: Fix s-parse warnings and a logic error about extracting the VBI PTS
+ V4L/DVB (10854): cx18: Correct comments about vertical and horizontal blanking timings
+ V4L/DVB (10855): cx18: Fix VPS service register codes
+ V4L/DVB (10856): cx18: Add interlock so sliced VBI insertion only happens for an MPEG PS
+
+Antoine Jacquet (1):
+ V4L/DVB (10263): zr364xx: add support for Aiptek DV T300
+
+Antonio Ospite (2):
+ V4L/DVB (10344): gspca - ov534: Disable the Hercules webcams.
+ V4L/DVB (10676): mt9m111: Call icl->reset() on mt9m111_reset().
+
+Antti Palosaari (2):
+ V4L/DVB (10286): af9015: add new USB ID for KWorld DVB-T 395U
+ V4L/DVB (10329): af9015: remove dual_mode module param
+
+Arne Luehrs (1):
+ V4L/DVB (10319): dib0700: enable IR receiver in Nova TD usb stick (52009)
+
+Bruno Christo (1):
+ V4L/DVB (10827): Add support for GeoVision GV-800(S)
+
+Devin Heitmueller (2):
+ V4L/DVB (10320): dib0700: fix i2c error message to make data type clear
+ V4L/DVB (10321): dib0700: Report dib0700_i2c_enumeration failures
+
+Douglas Kosovic (1):
+ V4L/DVB (10299): bttv: Add support for IVCE-8784 support for V4L2 bttv driver
+
+Douglas Schilling Landgraf (12):
+ V4L/DVB (10323): em28xx: Add entry for GADMEI TVR200
+ V4L/DVB (10326): em28xx: Cleanup: fix bad whitespacing
+ V4L/DVB (10327): em28xx: Add check before call em28xx_isoc_audio_deinit()
+ V4L/DVB (10517): em28xx: remove bad check (changeset a31c595188af)
+ V4L/DVB (10520): em28xx-audio: Add spinlock for trigger
+ V4L/DVB (10521): em28xx-audio: Add lock for users
+ V4L/DVB (10523): em28xx-audio: Add macros EM28XX_START_AUDIO / EM28XX_STOP_AUDIO
+ V4L/DVB (10524): em28xx: Add DVC 101 model to Pinnacle Dazzle description
+ V4L/DVB (10556): em28xx-cards: Add Pinnacle Dazzle Video Creator Plus DVC107 description
+ V4L/DVB (10739): em28xx-cards: remove incorrect entry
+ V4L/DVB (10740): em28xx-cards: Add SIIG AVTuner-PVR board
+ V4L/DVB (10741): em28xx: Add Kaiser Baas Video to DVD maker support
+
+Erik Andren (3):
+ V4L/DVB (10334): gspca - stv06xx: Rework control description.
+ V4L/DVB (10341): gspca - stv06xx: Plug a memory leak in the pb0100 sensor driver.
+ V4L/DVB (10342): gspca - stv06xx: Add ctrl caching to the vv6410.
+
+Erik S. Beiser (1):
+ V4L/DVB (10826): cx88: Add IR support to pcHDTV HD3000 & HD5500
+
+Guennadi Liakhovetski (5):
+ V4L/DVB (10665): soc-camera: add data signal polarity flags to drivers
+ V4L/DVB (10672): sh_mobile_ceu_camera: include NV* formats into the format list only once.
+ V4L/DVB (10673): mt9t031: fix gain and hflip controls, register update, and scaling
+ V4L/DVB (10674): soc-camera: camera host driver for i.MX3x SoCs
+ V4L/DVB (10675): soc-camera: extend soc_camera_bus_param_compatible with more tests
+
+Hans Verkuil (107):
+ V4L/DVB (10231): v4l2-subdev: add v4l2_ext_controls support
+ V4L/DVB (10244): v4l2: replace a few snprintfs with strlcpy
+ V4L/DVB (10246): saa6752hs: convert to v4l2_subdev.
+ V4L/DVB (10247): saa7134: convert to the new v4l2 framework.
+ V4L/DVB (10249): v4l2-common: added v4l2_i2c_tuner_addrs()
+ V4L/DVB (10251): cx25840: add comments explaining what the init() does.
+ V4L/DVB (10252): v4l2 doc: explain why v4l2_device_unregister_subdev() has to be called.
+ V4L/DVB (10271): saa7146: convert to video_ioctl2.
+ V4L/DVB (10272): av7110: test type field in VIDIOC_G_SLICED_VBI_CAP
+ V4L/DVB (10291): em28xx: fix VIDIOC_G_CTRL when there is no msp34xx device.
+ V4L/DVB (10313): saa7146: fix VIDIOC_ENUMSTD.
+ V4L/DVB (10406): gspca: fix compiler warning
+ V4L/DVB (10408): v4l2: fix incorrect hue range check
+ V4L/DVB (10409): v4l: remove unused I2C_DRIVERIDs.
+ V4L/DVB (10486): ivtv/cx18: fix g_fmt and try_fmt for raw video
+ V4L/DVB (10487): doc: update hm12 documentation.
+ V4L/DVB (10488): ivtv: cleanup naming conventions
+ V4L/DVB (10489): doc: use consistent naming conventions for vdev and v4l2_dev.
+ V4L/DVB (10490): v4l2: prefill ident and revision from v4l2_dbg_chip_ident.
+ V4L/DVB (10496): saa7146: implement v4l2_device support.
+ V4L/DVB (10497): saa7146: i2c adapdata now points to v4l2_device.
+ V4L/DVB (10498): saa7146: the adapter class will be NULL when v4l2_subdev is used.
+ V4L/DVB (10499): saa7146: convert saa7146 and mxb in particular to v4l2_subdev.
+ V4L/DVB (10500): saa7146: setting control while capturing should return EBUSY, not EINVAL.
+ V4L/DVB (10501): saa7146: prevent unnecessary loading of v4l2-common.
+ V4L/DVB (10502): saa7146: move v4l2 device registration to saa7146_vv.
+ V4L/DVB (10536): saa6588: convert to v4l2-i2c-drv-legacy.h
+ V4L/DVB (10537): saa6588: convert to v4l2_subdev.
+ V4L/DVB (10538): saa6588: add g_chip_ident support.
+ V4L/DVB (10539): saa6588: remove legacy_class, not needed for saa6588
+ V4L/DVB (10540): cx2341x: fixed bug causing several audio controls to be no longer listed
+ V4L/DVB (10542): v4l2-subdev: add querystd and g_input_status
+ V4L/DVB (10544): v4l2-common: add comments warning that about the sort order
+ V4L/DVB (10641): v4l2-dev: remove limit of 32 devices per driver in get_index()
+ V4L/DVB (10642): vivi: update comment to reflect that vivi can now create more than 32 devs.
+ V4L/DVB (10643): v4l2-device: allow a NULL parent device when registering.
+ V4L/DVB (10644): v4l2-subdev: rename dev field to v4l2_dev
+ V4L/DVB (10645): vivi: introduce v4l2_device and do several cleanups
+ V4L/DVB (10646): vivi: controls are per-device, not global.
+ V4L/DVB (10647): vivi: add slider flag to controls.
+ V4L/DVB (10685): v4l2: add colorfx support to v4l2-common.c, and add to 'Changes' in spec.
+ V4L/DVB (10686): v4l2: add V4L2_CTRL_FLAG_WRITE_ONLY flag.
+ V4L/DVB (10687): v4l2-common/v4l2-spec: support/document write-only and button controls
+ V4L/DVB (10691): v4l2-common: add v4l2_i2c_subdev_addr()
+ V4L/DVB (10692): usbvision: convert to v4l2_device/v4l2_subdev.
+ V4L/DVB (10698): v4l2-common: remove v4l2_ctrl_query_fill_std
+ V4L/DVB (10700): saa7115: don't access reg 0x87 if it is not present.
+ V4L/DVB (10701): saa7185: add colorbar support.
+ V4L/DVB (10702): saa7115: add querystd and g_input_status support for zoran.
+ V4L/DVB (10703): zoran: convert to video_ioctl2 and remove 'ready_to_be_freed' hack.
+ V4L/DVB (10704): zoran: remove broken BIGPHYS_AREA and BUZ_HIMEM code, and allow for kmallocs > 128 kB
+ V4L/DVB (10705): zoran: use slider flag with volume etc. controls.
+ V4L/DVB (10706): zoran: fix field typo.
+ V4L/DVB (10707): zoran: set bytesperline to 0 when using MJPEG.
+ V4L/DVB (10708): zoran: remove old V4L1 ioctls, use v4l1-compat instead.
+ V4L/DVB (10709): zoran: set correct parent of the video device.
+ V4L/DVB (10710): zoran: cleanups in an attempt to make the source a bit more readable.
+ V4L/DVB (10711): zoran: fix TRY_FMT support
+ V4L/DVB (10712): zoran: fix G_FMT
+ V4L/DVB (10713): zoran: if reqbufs is called with count == 0, do a streamoff.
+ V4L/DVB (10714): zoran et al: convert zoran i2c modules to V4L2.
+ V4L/DVB (10715): zoran: clean up some old V4L1 left-overs and remove the MAP_NR macro.
+ V4L/DVB (10716): zoran: change buffer defaults to something that works with tvtime
+ V4L/DVB (10717): zoran: TRY_FMT and S_FMT now do the same parameter checks.
+ V4L/DVB (10718): bt866: convert to v4l2_subdev.
+ V4L/DVB (10719): bt819: convert to v4l2_subdev.
+ V4L/DVB (10720): bt819: that delay include is needed after all.
+ V4L/DVB (10721): bt856: convert to v4l2_subdev.
[...35413 lines suppressed...]
+@@ -4340,10 +3291,7 @@ zoran_vm_close (struct vm_area_struct *vma)
ZORAN_FREE;
spin_unlock_irqrestore(&zr->spinlock, flags);
}
@@ -66460,7 +80655,7 @@
mutex_unlock(&zr->resource_lock);
}
-@@ -4582,11 +3531,56 @@ zoran_mmap (struct file *file,
+@@ -4582,11 +3530,56 @@ zoran_mmap (struct file *file,
return 0;
}
@@ -66518,7 +80713,7 @@
.read = zoran_read,
.write = zoran_write,
.mmap = zoran_mmap,
-@@ -4596,7 +3590,9 @@ static const struct v4l2_file_operations zoran_fops = {
+@@ -4596,7 +3589,9 @@ static const struct v4l2_file_operations zoran_fops = {
struct video_device zoran_template __devinitdata = {
.name = ZORAN_NAME,
.fops = &zoran_fops,
@@ -66608,17 +80803,72 @@
};
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
-index 106c3ba..d97133d 100644
+index 106c3ba..5bd3efd 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
-@@ -158,7 +158,6 @@ header-y += un.h
+@@ -157,8 +157,6 @@ header-y += ultrasound.h
+ header-y += un.h
header-y += utime.h
header-y += veth.h
- header-y += video_decoder.h
+-header-y += video_decoder.h
-header-y += video_encoder.h
header-y += videotext.h
header-y += x25.h
+diff --git a/include/linux/video_decoder.h b/include/linux/video_decoder.h
+deleted file mode 100644
+index e26c0c8..0000000
+--- a/include/linux/video_decoder.h
++++ /dev/null
+@@ -1,48 +0,0 @@
+-#ifndef _LINUX_VIDEO_DECODER_H
+-#define _LINUX_VIDEO_DECODER_H
+-
+-#include <linux/types.h>
+-
+-#define HAVE_VIDEO_DECODER 1
+-
+-struct video_decoder_capability { /* this name is too long */
+- __u32 flags;
+-#define VIDEO_DECODER_PAL 1 /* can decode PAL signal */
+-#define VIDEO_DECODER_NTSC 2 /* can decode NTSC */
+-#define VIDEO_DECODER_SECAM 4 /* can decode SECAM */
+-#define VIDEO_DECODER_AUTO 8 /* can autosense norm */
+-#define VIDEO_DECODER_CCIR 16 /* CCIR-601 pixel rate (720 pixels per line) instead of square pixel rate */
+- int inputs; /* number of inputs */
+- int outputs; /* number of outputs */
+-};
+-
+-/*
+-DECODER_GET_STATUS returns the following flags. The only one you need is
+-DECODER_STATUS_GOOD, the others are just nice things to know.
+-*/
+-#define DECODER_STATUS_GOOD 1 /* receiving acceptable input */
+-#define DECODER_STATUS_COLOR 2 /* receiving color information */
+-#define DECODER_STATUS_PAL 4 /* auto detected */
+-#define DECODER_STATUS_NTSC 8 /* auto detected */
+-#define DECODER_STATUS_SECAM 16 /* auto detected */
+-
+-struct video_decoder_init {
+- unsigned char len;
+- const unsigned char *data;
+-};
+-
+-#define DECODER_GET_CAPABILITIES _IOR('d', 1, struct video_decoder_capability)
+-#define DECODER_GET_STATUS _IOR('d', 2, int)
+-#define DECODER_SET_NORM _IOW('d', 3, int)
+-#define DECODER_SET_INPUT _IOW('d', 4, int) /* 0 <= input < #inputs */
+-#define DECODER_SET_OUTPUT _IOW('d', 5, int) /* 0 <= output < #outputs */
+-#define DECODER_ENABLE_OUTPUT _IOW('d', 6, int) /* boolean output enable control */
+-#define DECODER_SET_PICTURE _IOW('d', 7, struct video_picture)
+-#define DECODER_SET_GPIO _IOW('d', 8, int) /* switch general purpose pin */
+-#define DECODER_INIT _IOW('d', 9, struct video_decoder_init) /* init internal registers at once */
+-#define DECODER_SET_VBI_BYPASS _IOW('d', 10, int) /* switch vbi bypass */
+-
+-#define DECODER_DUMP _IO('d', 192) /* debug hook */
+-
+-
+-#endif
diff --git a/include/linux/video_encoder.h b/include/linux/video_encoder.h
deleted file mode 100644
index b7b6423..0000000
@@ -66648,6 +80898,42 @@
-
-
-#endif
+diff --git a/include/linux/videodev.h b/include/linux/videodev.h
+index 837f392..b19eab1 100644
+--- a/include/linux/videodev.h
++++ b/include/linux/videodev.h
+@@ -16,6 +16,23 @@
+ #include <linux/ioctl.h>
+ #include <linux/videodev2.h>
+
++#if defined(__MIN_V4L1) && defined (__KERNEL__)
++
++/*
++ * Used by those V4L2 core functions that need a minimum V4L1 support,
++ * in order to allow V4L1 Compatibilty code compilation.
++ */
++
++struct video_mbuf
++{
++ int size; /* Total memory to map */
++ int frames; /* Frames */
++ int offsets[VIDEO_MAX_FRAME];
++};
++
++#define VIDIOCGMBUF _IOR('v',20, struct video_mbuf) /* Memory map buffer info */
++
++#else
+ #if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)
+
+ #define VID_TYPE_CAPTURE 1 /* Can capture */
+@@ -312,6 +329,7 @@ struct video_code
+ #define VID_PLAY_END_MARK 14
+
+ #endif /* CONFIG_VIDEO_V4L1_COMPAT */
++#endif /* __MIN_V4L1 */
+
+ #endif /* __LINUX_VIDEODEV_H */
+
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 5571dbe..11b8b3e 100644
--- a/include/linux/videodev2.h
@@ -66900,7 +81186,7 @@
extern unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
-index 9aaf652..70117e7 100644
+index 9aaf652..43684f1 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -37,10 +37,8 @@ enum {
@@ -66915,7 +81201,7 @@
V4L2_IDENT_SAA7113 = 103,
V4L2_IDENT_SAA7114 = 104,
V4L2_IDENT_SAA7115 = 105,
-@@ -63,30 +61,82 @@ enum {
+@@ -63,30 +61,88 @@ enum {
V4L2_IDENT_OV7720 = 251,
V4L2_IDENT_OV7725 = 252,
@@ -66929,6 +81215,9 @@
V4L2_IDENT_CX23416 = 416,
V4L2_IDENT_CX23418 = 418,
++ /* module indycam: just ident 2000 */
++ V4L2_IDENT_INDYCAM = 2000,
++
+ /* module bt819: reserved range 810-819 */
+ V4L2_IDENT_BT815A = 815,
+ V4L2_IDENT_BT817A = 817,
@@ -66987,6 +81276,9 @@
+ /* module saa7185: just ident 7185 */
+ V4L2_IDENT_SAA7185 = 7185,
+
++ /* module saa7191: just ident 7191 */
++ V4L2_IDENT_SAA7191 = 7191,
++
/* module wm8739: just ident 8739 */
V4L2_IDENT_WM8739 = 8739,
@@ -67143,10 +81435,18 @@
#endif
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
-index b01c044..a8b4c0b 100644
+index b01c044..7a4529d 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
-@@ -267,6 +267,7 @@ struct v4l2_ioctl_ops {
+@@ -15,6 +15,7 @@
+ #include <linux/mutex.h>
+ #include <linux/compiler.h> /* need __user */
+ #ifdef CONFIG_VIDEO_V4L1_COMPAT
++#define __MIN_V4L1
+ #include <linux/videodev.h>
+ #else
+ #include <linux/videodev2.h>
+@@ -267,6 +268,7 @@ struct v4l2_ioctl_ops {
/* Video standard functions */
extern const char *v4l2_norm_to_name(v4l2_std_id id);
More information about the fedora-extras-commits
mailing list