summaryrefslogtreecommitdiff
path: root/debian/patches/debian/dfsg
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2012-12-16 15:20:29 +0000
committerBen Hutchings <benh@debian.org>2012-12-16 15:20:29 +0000
commit8123ace851707cad1ea78ea2330e62928f3a7fa1 (patch)
tree042d327637a3d43fa9831285668f746dca71730a /debian/patches/debian/dfsg
parentef781eb6eec9b61b82a8bafc92718bd49d95ba0f (diff)
downloaddebian-kernel-packaging-8123ace851707cad1ea78ea2330e62928f3a7fa1.tar.gz
Update to 3.7
Update aufs to aufs3.x-rcN-20121210. Disable rt, probably not available for 3.7. Refresh/drop patches. They apply but the result may not build. svn path=/dists/trunk/linux/; revision=19608
Diffstat (limited to 'debian/patches/debian/dfsg')
-rw-r--r--debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch24
-rw-r--r--debian/patches/debian/dfsg/vs6624-disable.patch16
2 files changed, 18 insertions, 22 deletions
diff --git a/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch b/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
index 4b80ad2ea..47bab0b1c 100644
--- a/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
+++ b/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
@@ -1,24 +1,14 @@
-From 2a7d7ecc9fdcdaa0b82865078fd2a47e3b46da1b Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 17 Aug 2009 02:45:41 +0100
-Subject: [PATCH 1/2] dvb-usb-af9005: mark as broken
+Subject: dvb-usb-af9005: mark as broken
----
- drivers/media/dvb/dvb-usb/Kconfig | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
-index 496c1a3..868e1cb 100644
---- a/drivers/media/dvb/dvb-usb/Kconfig
-+++ b/drivers/media/dvb/dvb-usb/Kconfig
-@@ -238,6 +238,7 @@ config DVB_USB_OPERA1
+--- a/drivers/media/usb/dvb-usb/Kconfig
++++ b/drivers/media/usb/dvb-usb/Kconfig
+@@ -227,6 +227,7 @@ config DVB_USB_OPERA1
config DVB_USB_AF9005
tristate "Afatech AF9005 DVB-T USB1.1 support"
+ depends on BROKEN
- depends on DVB_USB && EXPERIMENTAL
- select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
- select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE
---
-1.6.3.3
-
+ depends on DVB_USB
+ select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT
+ select MEDIA_TUNER_QT1010 if MEDIA_SUBDRV_AUTOSELECT
diff --git a/debian/patches/debian/dfsg/vs6624-disable.patch b/debian/patches/debian/dfsg/vs6624-disable.patch
index e36b6d127..08dba87be 100644
--- a/debian/patches/debian/dfsg/vs6624-disable.patch
+++ b/debian/patches/debian/dfsg/vs6624-disable.patch
@@ -1,8 +1,14 @@
-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
-@@ -497,2 +497,3 @@ config VIDEO_OV7670
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sun, 27 May 2012 01:56:58 +0100
+Subject: vs6624: mark as broken
+
+--- a/drivers/media/i2c/Kconfig
++++ b/drivers/media/i2c/Kconfig
+@@ -422,6 +422,7 @@ config VIDEO_OV7670
+ controller.
+
config VIDEO_VS6624
+ depends on BROKEN
tristate "ST VS6624 sensor support"
+ depends on VIDEO_V4L2 && I2C
+ depends on MEDIA_CAMERA_SUPPORT