[kernel] r19038 - in dists/trunk/linux-2.6/debian: . patches/debian/dfsg patches/series

[Ben Hutchings]

Author: benh
Date: Sun May 27 00:56:58 2012
New Revision: 19038

Log:
DFSG: Remove the new vs6624 driver, which contains non-free firmware

Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/vs6624-disable.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
   dists/trunk/linux-2.6/debian/patches/series/orig-0

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun May 27 00:21:22 2012	(r19037)
+++ dists/trunk/linux-2.6/debian/changelog	Sun May 27 00:56:58 2012	(r19038)
@@ -2,11 +2,15 @@
 
   * New upstream release: http://kernelnewbies.org/Linux_3.4
 
+  [ maximilian attems ]
   * Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
     IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
     NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO,
     NET_CALXEDA_XGMAC, NET_TEAM, ATH6KL.
 
+  [ Ben Hutchings ]
+  * DFSG: Remove the new vs6624 driver, which contains non-free firmware
+
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 21 May 2012 01:37:21 +0100
 
 linux-2.6 (3.3.6-1~experimental.1) experimental; urgency=low

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Sun May 27 00:21:22 2012	(r19037)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Sun May 27 00:56:58 2012	(r19038)
@@ -8,6 +8,8 @@
 
 rm drivers/media/dvb/dvb-usb/af9005-script.h
 
+rm drivers/media/video/vs6624.c
+
 rm drivers/net/appletalk/cops.c
 rm drivers/net/appletalk/cops.h
 rm drivers/net/appletalk/cops_ffdrv.h

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/vs6624-disable.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/vs6624-disable.patch	Sun May 27 00:56:58 2012	(r19038)
@@ -0,0 +1,12 @@
+diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
+index ce1e7ba..4bd5a0c 100644
+--- a/drivers/media/video/Kconfig
++++ b/drivers/media/video/Kconfig
+@@ -483,6 +483,7 @@ config VIDEO_OV7670
+ config VIDEO_VS6624
+ 	tristate "ST VS6624 sensor support"
+ 	depends on VIDEO_V4L2 && I2C
++	depends on BROKEN
+ 	---help---
+ 	  This is a Video4Linux2 sensor-level driver for the ST VS6624
+ 	  camera.

Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0	Sun May 27 00:21:22 2012	(r19037)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0	Sun May 27 00:56:58 2012	(r19038)
@@ -1,5 +1,6 @@
 + debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
 + debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
++ debian/dfsg/vs6624-disable.patch
 + debian/dfsg/drivers-net-appletalk-cops.patch
 + debian/dfsg/drivers-staging-wlags49_h2-disable.patch
 + debian/dfsg/drivers-staging-wlags49_h25-disable.patch