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

[Ben Hutchings]

Author: benh
Date: Mon Aug 17 01:53:42 2009
New Revision: 14129

Log:
dvb-usb-af9005: remove firmware and disable

Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-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	Mon Aug 17 01:42:02 2009	(r14128)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Aug 17 01:53:42 2009	(r14129)
@@ -50,6 +50,7 @@
     thanks to Kalle Olavi Niemitalo <kon at iki.fi>
   * ib_ipath: remove firmware for QLogic IBA7220 and use
     request_firmware() to load it
+  * dvb-usb-af9005: remove firmware and disable
 
   [ Martin Michlmayr ]
   * [armel/orion5x, armel/kirkwood] Set GPIO_SYSFS=y since these

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch	Mon Aug 17 01:53:42 2009	(r14129)
@@ -0,0 +1,24 @@
+From 2a7d7ecc9fdcdaa0b82865078fd2a47e3b46da1b Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 17 Aug 2009 02:45:41 +0100
+Subject: [PATCH 1/2] 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
+ 
+ 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
+

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Mon Aug 17 01:42:02 2009	(r14128)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Mon Aug 17 01:53:42 2009	(r14129)
@@ -32,6 +32,8 @@
 
 rm arch/powerpc/sysdev/micropatch.c
 
+rm drivers/media/dvb/dvb-usb/af9005-script.h
+
 rm drivers/gpu/drm/mga/mga_ucode.h
 
 unifdef drivers/gpu/drm/r128/r128_cce.c -UREMOVE_DFSG

Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0	Mon Aug 17 01:42:02 2009	(r14128)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0	Mon Aug 17 01:53:42 2009	(r14129)
@@ -1,4 +1,5 @@
 + debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
++ debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
 + debian/dfsg/drivers-gpu-drm-mga-disable.patch
 + debian/dfsg/drivers-gpu-drm-r128-disable.patch
 + debian/dfsg/drivers-gpu-drm-radeon-disable.patch