rpms/kernel/F-12 kernel.spec, 1.1995, 1.1996 linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch, 1.2, 1.3
Kyle McMartin
kyle at fedoraproject.org
Mon Jan 25 22:10:47 UTC 2010
Author: kyle
Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7245
Modified Files:
kernel.spec linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch
Log Message:
* Mon Jan 25 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.6-36
- fix gspca mismerge.
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1995
retrieving revision 1.1996
diff -u -p -r1.1995 -r1.1996
--- kernel.spec 25 Jan 2010 21:38:22 -0000 1.1995
+++ kernel.spec 25 Jan 2010 22:10:45 -0000 1.1996
@@ -2029,6 +2029,9 @@ fi
# and build.
%changelog
+* Mon Jan 25 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.6-36
+- fix gspca mismerge.
+
* Mon Jan 25 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.6-35
- stable update 2.6.32.6
- rebase gspca crud.
linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch:
Documentation/video4linux/gspca.txt | 69
drivers/media/video/gspca/Kconfig | 69
drivers/media/video/gspca/Makefile | 12
drivers/media/video/gspca/benq.c | 322 +++
drivers/media/video/gspca/conex.c | 20
drivers/media/video/gspca/cpia1.c | 2022 ++++++++++++++++++++
drivers/media/video/gspca/etoms.c | 18
drivers/media/video/gspca/finepix.c | 23
drivers/media/video/gspca/gl860/gl860-mi1320.c | 57
drivers/media/video/gspca/gl860/gl860-mi2020.c | 71
drivers/media/video/gspca/gl860/gl860-ov2640.c | 140 -
drivers/media/video/gspca/gl860/gl860-ov9655.c | 43
drivers/media/video/gspca/gl860/gl860.c | 81
drivers/media/video/gspca/gl860/gl860.h | 7
drivers/media/video/gspca/gspca.c | 223 +-
drivers/media/video/gspca/gspca.h | 35
drivers/media/video/gspca/jeilinj.c | 34
drivers/media/video/gspca/m5602/m5602_core.c | 29
drivers/media/video/gspca/m5602/m5602_mt9m111.c | 4
drivers/media/video/gspca/m5602/m5602_ov7660.c | 2
drivers/media/video/gspca/m5602/m5602_ov7660.h | 2
drivers/media/video/gspca/m5602/m5602_ov9650.c | 4
drivers/media/video/gspca/m5602/m5602_po1030.c | 2
drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 18
drivers/media/video/gspca/m5602/m5602_s5k83a.c | 2
drivers/media/video/gspca/mars.c | 13
drivers/media/video/gspca/mr97310a.c | 615 +++---
drivers/media/video/gspca/ov519.c | 1590 +++++++++++++--
drivers/media/video/gspca/ov534.c | 1330 +++++++------
drivers/media/video/gspca/ov534_9.c | 1477 ++++++++++++++
drivers/media/video/gspca/pac207.c | 15
drivers/media/video/gspca/pac7302.c | 1237 ++++++++++++
drivers/media/video/gspca/pac7311.c | 623 +-----
drivers/media/video/gspca/pac_common.h | 91
drivers/media/video/gspca/sn9c2028.c | 757 +++++++
drivers/media/video/gspca/sn9c2028.h | 51
drivers/media/video/gspca/sn9c20x.c | 56
drivers/media/video/gspca/sonixb.c | 58
drivers/media/video/gspca/sonixj.c | 966 ++++++---
drivers/media/video/gspca/spca500.c | 15
drivers/media/video/gspca/spca501.c | 16
drivers/media/video/gspca/spca505.c | 12
drivers/media/video/gspca/spca506.c | 20
drivers/media/video/gspca/spca508.c | 12
drivers/media/video/gspca/spca561.c | 18
drivers/media/video/gspca/sq905.c | 75
drivers/media/video/gspca/sq905c.c | 76
drivers/media/video/gspca/stk014.c | 119 -
drivers/media/video/gspca/stv0680.c | 394 +++
drivers/media/video/gspca/stv06xx/stv06xx.c | 14
drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 1
drivers/media/video/gspca/sunplus.c | 301 +-
drivers/media/video/gspca/t613.c | 9
drivers/media/video/gspca/tv8532.c | 9
drivers/media/video/gspca/vc032x.c | 736 ++++++-
drivers/media/video/gspca/w996Xcf.c | 609 ++++++
drivers/media/video/gspca/zc3xx.c | 2118 ++++++++-------------
include/linux/videodev2.h | 15
58 files changed, 12848 insertions(+), 3909 deletions(-)
Index: linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch 25 Jan 2010 21:38:22 -0000 1.2
+++ linux-2.6-v4l-dvb-rebase-gspca-to-latest.patch 25 Jan 2010 22:10:46 -0000 1.3
@@ -1,77 +1,3 @@
-From b9e9d3b5637a92a02705fe38ef136b2c3b785487 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle at ihatethathostname.lab.bos.redhat.com>
-Date: Mon, 25 Jan 2010 16:32:38 -0500
-Subject: [PATCH] linux-2.6-v4l-dvb-rebase-gspca-to-latest
-
----
- Documentation/video4linux/gspca.txt | 69 +-
- drivers/media/video/gspca/Kconfig | 69 +-
- drivers/media/video/gspca/Makefile | 12 +
- drivers/media/video/gspca/benq.c | 322 +++
- drivers/media/video/gspca/conex.c | 20 +-
- drivers/media/video/gspca/cpia1.c | 2022 +++++++++++++++++++
- drivers/media/video/gspca/etoms.c | 18 +-
- drivers/media/video/gspca/finepix.c | 23 +-
- drivers/media/video/gspca/gl860/gl860-mi1320.c | 57 +-
- drivers/media/video/gspca/gl860/gl860-mi2020.c | 71 +-
- drivers/media/video/gspca/gl860/gl860-ov2640.c | 140 +-
- drivers/media/video/gspca/gl860/gl860-ov9655.c | 43 +-
- drivers/media/video/gspca/gl860/gl860.c | 81 +-
- drivers/media/video/gspca/gl860/gl860.h | 7 +-
- drivers/media/video/gspca/gspca.c | 223 ++-
- drivers/media/video/gspca/gspca.h | 35 +-
- drivers/media/video/gspca/jeilinj.c | 34 +-
- drivers/media/video/gspca/m5602/m5602_core.c | 29 +-
- drivers/media/video/gspca/m5602/m5602_mt9m111.c | 4 +-
- drivers/media/video/gspca/m5602/m5602_ov7660.c | 2 +-
- drivers/media/video/gspca/m5602/m5602_ov7660.h | 2 +-
- drivers/media/video/gspca/m5602/m5602_ov9650.c | 4 +-
- drivers/media/video/gspca/m5602/m5602_po1030.c | 2 +-
- drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 18 +-
- drivers/media/video/gspca/m5602/m5602_s5k83a.c | 2 +-
- drivers/media/video/gspca/mars.c | 13 +-
- drivers/media/video/gspca/mr97310a.c | 615 ++++---
- drivers/media/video/gspca/ov519.c | 1590 +++++++++++++--
- drivers/media/video/gspca/ov534.c | 1330 +++++++-----
- drivers/media/video/gspca/ov534_9.c | 1477 ++++++++++++++
- drivers/media/video/gspca/pac207.c | 15 +-
- drivers/media/video/gspca/pac7302.c | 1237 ++++++++++++
- drivers/media/video/gspca/pac7311.c | 623 ++----
- drivers/media/video/gspca/pac_common.h | 91 +-
- drivers/media/video/gspca/sn9c2028.c | 757 +++++++
- drivers/media/video/gspca/sn9c2028.h | 51 +
- drivers/media/video/gspca/sn9c20x.c | 56 +-
- drivers/media/video/gspca/sonixb.c | 58 +-
- drivers/media/video/gspca/sonixj.c | 966 ++++++---
- drivers/media/video/gspca/spca500.c | 15 +-
- drivers/media/video/gspca/spca501.c | 16 +-
- drivers/media/video/gspca/spca505.c | 12 +-
- drivers/media/video/gspca/spca506.c | 20 +-
- drivers/media/video/gspca/spca508.c | 12 +-
- drivers/media/video/gspca/spca561.c | 18 +-
- drivers/media/video/gspca/sq905.c | 75 +-
- drivers/media/video/gspca/sq905c.c | 76 +-
- drivers/media/video/gspca/stk014.c | 119 +-
- drivers/media/video/gspca/stv0680.c | 394 ++++
- drivers/media/video/gspca/stv06xx/stv06xx.c | 14 +-
- drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 1 +
- drivers/media/video/gspca/sunplus.c | 299 ++--
- drivers/media/video/gspca/t613.c | 9 +-
- drivers/media/video/gspca/tv8532.c | 9 +-
- drivers/media/video/gspca/vc032x.c | 736 ++++++-
- drivers/media/video/gspca/w996Xcf.c | 609 ++++++
- drivers/media/video/gspca/zc3xx.c | 2118 ++++++++------------
- include/linux/videodev2.h | 15 +-
- 58 files changed, 12847 insertions(+), 3908 deletions(-)
- create mode 100644 drivers/media/video/gspca/benq.c
- create mode 100644 drivers/media/video/gspca/cpia1.c
- create mode 100644 drivers/media/video/gspca/ov534_9.c
- create mode 100644 drivers/media/video/gspca/pac7302.c
- create mode 100644 drivers/media/video/gspca/sn9c2028.c
- create mode 100644 drivers/media/video/gspca/sn9c2028.h
- create mode 100644 drivers/media/video/gspca/stv0680.c
- create mode 100644 drivers/media/video/gspca/w996Xcf.c
-
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 90e85a8..939dda9 100644
--- a/Documentation/video4linux/gspca.txt
@@ -17915,7 +17841,7 @@ index 487d405..96c6192 100644
{x1500, 0x1500, ARRAY_SIZE(x1500)},
{x1536, 0x1536, ARRAY_SIZE(x1536)},
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
-index 28b4625..fc62c76 100644
+index 28b4625..952d7e5 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -67,7 +67,7 @@ static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
@@ -18232,7 +18158,8 @@ index 28b4625..fc62c76 100644
+ spca504B_PollingDataReady(gspca_dev);
/* Init the cam width height with some values get on init ? */
- reg_w_riv(dev, 0x31, 0x04, 0);
+- reg_w_riv(dev, 0x31, 0x04, 0);
++ reg_w_riv(gspca_dev, 0x31, 0x04, 0);
spca504B_WaitCmdStatus(gspca_dev);
- rc = spca504B_PollingDataReady(gspca_dev);
+ spca504B_PollingDataReady(gspca_dev);
@@ -23971,6 +23898,3 @@ index b59e78c..535ea7b 100644
/* MPEG-class control IDs defined by V4L2 */
#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)
---
-1.6.6
-
More information about the scm-commits
mailing list