[kernel] r12948 - dists/trunk/linux-2.6/debian/patches/debian/dfsg

Ben Hutchings benh at alioth.debian.org
Mon Feb 23 20:57:59 UTC 2009 

Author: benh
Date: Mon Feb 23 20:57:57 2009
New Revision: 12948

Log:
debian/patches/debian/dfsg: Add accidentally omitted firmware-removal patches


Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-gpu-drm-mga-disable.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-gpu-drm-r128-disable.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-gpu-drm-radeon-disable.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tehuti-disable.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-typhoon-disable.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-scsi-qla1280-disable.patch

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-gpu-drm-mga-disable.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-gpu-drm-mga-disable.patch	Mon Feb 23 20:57:57 2009
@@ -0,0 +1,24 @@
+From 9d67de9a0ec1c9eed5be2c733210e9759c063b12 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 18 Oct 2008 02:46:55 +0100
+Subject: [PATCH 16/24] mga: Mark as broken
+
+---
+ drivers/gpu/drm/Kconfig |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
+index 09ed655..853814c 100644
+--- a/drivers/gpu/drm/Kconfig
++++ b/drivers/gpu/drm/Kconfig
+@@ -81,6 +81,7 @@ endchoice
+ config DRM_MGA
+ 	tristate "Matrox g200/g400"
+ 	depends on DRM
++	depends on BROKEN
+ 	help
+ 	  Choose this option if you have a Matrox G200, G400 or G450 graphics
+ 	  card.  If M is selected, the module will be called mga.  AGP
+-- 
+1.6.1.3
+

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-gpu-drm-r128-disable.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-gpu-drm-r128-disable.patch	Mon Feb 23 20:57:57 2009
@@ -0,0 +1,45 @@
+From 2765959b3b6f56ada99e770c1001861a5de2d1b7 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Wed, 15 Oct 2008 00:40:17 +0100
+Subject: [PATCH 01/24] r128: Add #ifdef markers around firmware and mark broken
+
+---
+ drivers/gpu/drm/Kconfig         |    1 +
+ drivers/gpu/drm/r128/r128_cce.c |    2 ++
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
+index a8b33c2..725f244 100644
+--- a/drivers/gpu/drm/Kconfig
++++ b/drivers/gpu/drm/Kconfig
+@@ -26,6 +26,7 @@ config DRM_TDFX
+ config DRM_R128
+ 	tristate "ATI Rage 128"
+ 	depends on DRM && PCI
++	depends on BROKEN
+ 	help
+ 	  Choose this option if you have an ATI Rage 128 graphics card.  If M
+ 	  is selected, the module will be called r128.  AGP support for
+diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
+index c31afbd..04d8358 100644
+--- a/drivers/gpu/drm/r128/r128_cce.c
++++ b/drivers/gpu/drm/r128/r128_cce.c
+@@ -36,6 +36,7 @@
+ 
+ #define R128_FIFO_DEBUG		0
+ 
++#ifdef REMOVE_DFSG
+ /* CCE microcode (from ATI) */
+ static u32 r128_cce_microcode[] = {
+ 	0, 276838400, 0, 268449792, 2, 142, 2, 145, 0, 1076765731, 0,
+@@ -80,6 +81,7 @@ static u32 r128_cce_microcode[] = {
+ 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ };
++#endif /* REMOVE_DFSG */
+ 
+ static int R128_READ_PLL(struct drm_device * dev, int addr)
+ {
+-- 
+1.6.1.3
+

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-gpu-drm-radeon-disable.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-gpu-drm-radeon-disable.patch	Mon Feb 23 20:57:57 2009
@@ -0,0 +1,24 @@
+From ddea6e0d2957bd506f49d87b0ec097458fd0eb2a Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Wed, 15 Oct 2008 01:21:34 +0100
+Subject: [PATCH 04/24] radeon: Mark as broken
+
+---
+ drivers/gpu/drm/Kconfig |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
+index e6f4401..a93d249 100644
+--- a/drivers/gpu/drm/Kconfig
++++ b/drivers/gpu/drm/Kconfig
+@@ -35,6 +35,7 @@ config DRM_R128
+ config DRM_RADEON
+ 	tristate "ATI Radeon"
+ 	depends on DRM && PCI
++	depends on BROKEN
+ 	help
+ 	  Choose this option if you have an ATI Radeon graphics card.  There
+ 	  are both PCI and AGP versions.  You don't need to choose this to
+-- 
+1.6.1.3
+

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tehuti-disable.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-tehuti-disable.patch	Mon Feb 23 20:57:57 2009
@@ -0,0 +1,24 @@
+From dd99cd4f032495eff278c128980c5e5b9a7b2047 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Wed, 15 Oct 2008 02:43:20 +0100
+Subject: [PATCH 13/24] tehuti: Mark as broken
+
+---
+ drivers/net/Kconfig |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
+index 64a39af..7fdc18f 100644
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2557,6 +2557,7 @@ config MLX4_DEBUG
+ config TEHUTI
+ 	tristate "Tehuti Networks 10G Ethernet"
+ 	depends on PCI
++	depends on BROKEN
+ 	help
+ 	  Tehuti Networks 10G Ethernet NIC
+ 
+-- 
+1.6.1.3
+

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-typhoon-disable.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-typhoon-disable.patch	Mon Feb 23 20:57:57 2009
@@ -0,0 +1,24 @@
+From e94e3972dc6c859ddca58baff52ea1c6c6953411 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 18 Oct 2008 14:07:10 +0100
+Subject: [PATCH 19/24] typhoon: Mark as broken
+
+---
+ drivers/net/Kconfig |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
+index ded4b06..4bddcbd 100644
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -732,6 +732,7 @@ config VORTEX
+ config TYPHOON
+ 	tristate "3cr990 series \"Typhoon\" support"
+ 	depends on NET_VENDOR_3COM && PCI
++	depends on BROKEN
+ 	select CRC32
+ 	---help---
+ 	  This option enables driver support for the 3cr990 series of cards:
+-- 
+1.6.1.3
+

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-scsi-qla1280-disable.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-scsi-qla1280-disable.patch	Mon Feb 23 20:57:57 2009
@@ -0,0 +1,24 @@
+From b783a61388fd6ad36027a096f18374e67c194d51 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 18 Oct 2008 16:14:43 +0100
+Subject: [PATCH 22/24] qla1280: Mark as broken
+
+---
+ drivers/scsi/Kconfig |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
+index 403ecad..3d97641 100644
+--- a/drivers/scsi/Kconfig
++++ b/drivers/scsi/Kconfig
+@@ -1328,6 +1328,7 @@ config SCSI_QLOGIC_FAS
+ config SCSI_QLOGIC_1280
+ 	tristate "Qlogic QLA 1240/1x80/1x160 SCSI support"
+ 	depends on PCI && SCSI
++	depends on BROKEN
+ 	help
+ 	  Say Y if you have a QLogic ISP1240/1x80/1x160 SCSI host adapter.
+ 
+-- 
+1.6.1.3
+

More information about the Kernel-svn-changes mailing list