All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brandon Philips <brandon@ifup.org>
To: mchehab@infradead.org, laurent.pinchart@skynet.be
Cc: v4l-dvb-maintainer@linuxtv.org,
	Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>,
	video4linux-list@redhat.com
Subject: [PATCH 1 of 3] Backed out changeset d002378ff8c2
Date: Mon, 04 Feb 2008 18:03:16 -0800	[thread overview]
Message-ID: <0810f250d078bf6159de.1202176996@localhost> (raw)
In-Reply-To: <patchbomb.1202176995@localhost>

# HG changeset patch
# User Brandon Philips <brandon@ifup.org>
# Date 1202175426 28800
# Node ID 0810f250d078bf6159de69569828c07cb54f4389
# Parent  d002378ff8c2d8e8bf3842d8f05469dd68398fc6
Backed out changeset d002378ff8c2

This change had a number of issues:
 - Adding an undiscussed control
 - Adding an unrelated mailimport change
 - Adding an unrelated kconfig change

diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig
--- a/linux/drivers/media/video/Kconfig
+++ b/linux/drivers/media/video/Kconfig
@@ -836,13 +836,4 @@ config USB_STKWEBCAM
 
 endif # V4L_USB_DRIVERS
 
-config SOC_CAMERA
-	tristate "SoC camera support"
-	depends on VIDEO_V4L2
-	select VIDEOBUF_DMA_SG
-	help
-	  SoC Camera is a common API to several cameras, not connecting
-	  over a bus like PCI or USB. For example some i2c camera connected
-	  directly to the data bus of an SoC.
-
 endif # VIDEO_CAPTURE_DRIVERS
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h
--- a/linux/include/linux/videodev2.h
+++ b/linux/include/linux/videodev2.h
@@ -281,7 +281,6 @@ struct v4l2_pix_format
 #define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B','G','R','4') /* 32  BGR-8-8-8-8   */
 #define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R','G','B','4') /* 32  RGB-8-8-8-8   */
 #define V4L2_PIX_FMT_GREY    v4l2_fourcc('G','R','E','Y') /*  8  Greyscale     */
-#define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y','1','6',' ') /* 16  Greyscale     */
 #define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P','A','L','8') /*  8  8-bit palette */
 #define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y','V','U','9') /*  9  YVU 4:1:0     */
 #define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y','V','1','2') /* 12  YVU 4:2:0     */
@@ -308,7 +307,6 @@ struct v4l2_pix_format
 
 /* see http://www.siliconimaging.com/RGB%20Bayer.htm */
 #define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B','A','8','1') /*  8  BGBG.. GRGR.. */
-#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B','Y','R','2') /* 16  BGBG.. GRGR.. */
 
 /* compressed formats */
 #define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M','J','P','G') /* Motion-JPEG   */
@@ -864,8 +862,7 @@ struct v4l2_querymenu
 #define V4L2_CID_VFLIP			(V4L2_CID_BASE+21)
 #define V4L2_CID_HCENTER		(V4L2_CID_BASE+22)
 #define V4L2_CID_VCENTER		(V4L2_CID_BASE+23)
-#define V4L2_CID_AUTOEXPOSURE		(V4L2_CID_BASE+24)
-#define V4L2_CID_LASTP1			(V4L2_CID_BASE+25) /* last CID + 1 */
+#define V4L2_CID_LASTP1			(V4L2_CID_BASE+24) /* last CID + 1 */
 
 /*  MPEG-class control IDs defined by V4L2 */
 #define V4L2_CID_MPEG_BASE 			(V4L2_CTRL_CLASS_MPEG | 0x900)
diff --git a/mailimport b/mailimport
--- a/mailimport
+++ b/mailimport
@@ -224,10 +224,6 @@ if [ -d "$NAME" ]; then
 	else
 		echo "Processing patches from tree $NAME"
 		for i in $NAME/*; do
-			if [ ! -r $i ]; then
-				sudo chmod og+r $i
-			fi
-
 			echo "$i"
 			proccess_patch "$i"
 		done

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

  reply	other threads:[~2008-02-05  2:12 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-05  2:03 [PATCH 0 of 3] Round Two: videodev2.h additions for UVC merge Brandon Philips
2008-02-05  2:03 ` Brandon Philips [this message]
2008-02-05  9:52   ` [PATCH 1 of 3] Backed out changeset d002378ff8c2 Guennadi Liakhovetski
2008-02-05 12:39     ` Mauro Carvalho Chehab
2008-02-05  2:03 ` [PATCH 2 of 3] [v4l] Add new user class controls and deprecate others Brandon Philips
2008-02-05 10:03   ` Guennadi Liakhovetski
2008-02-05 23:43     ` Brandon Philips
2008-02-07 13:20       ` Mauro Carvalho Chehab
2008-02-05  2:03 ` [PATCH 3 of 3] [v4l] Add camera class control definitions Brandon Philips

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0810f250d078bf6159de.1202176996@localhost \
    --to=brandon@ifup.org \
    --cc=g.liakhovetski@pengutronix.de \
    --cc=laurent.pinchart@skynet.be \
    --cc=mchehab@infradead.org \
    --cc=v4l-dvb-maintainer@linuxtv.org \
    --cc=video4linux-list@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.