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

[Maximilian Attems]

Author: maks
Date: Sat Jul 18 15:48:36 2009
New Revision: 13965

Log:
staging has with rtl8192su another firmware blob without license

nuke it and disable the driver

Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rtl8192su-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	Sat Jul 18 15:48:27 2009	(r13964)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Jul 18 15:48:36 2009	(r13965)
@@ -20,6 +20,7 @@
   * [x86_64] Enable HW_RANDOM_VIA.
   * [x86] Keep divers staging stuff enabled.
   * [x86] Enable RT3070, COMEDI_PCMCIA_DRIVERS.
+  * rtl8192su: remove firmware and disable.
 
   [ Ben Hutchings ]
   * mga: remove unnecessary change from firmware-loading patch

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch	Sat Jul 18 15:48:36 2009	(r13965)
@@ -0,0 +1,11 @@
+diff --git a/drivers/staging/rtl8192su/Kconfig b/drivers/staging/rtl8192su/Kconfig
+index 770f412..3b6b088 100644
+--- a/drivers/staging/rtl8192su/Kconfig
++++ b/drivers/staging/rtl8192su/Kconfig
+@@ -1,5 +1,6 @@
+ config RTL8192SU
+ 	tristate "RealTek RTL8192SU Wireless LAN NIC driver"
++	depends on BROKEN
+ 	depends on PCI
+ 	depends on WIRELESS_EXT
+ 	default N

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Sat Jul 18 15:48:27 2009	(r13964)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Sat Jul 18 15:48:36 2009	(r13965)
@@ -55,6 +55,8 @@
 
 rm drivers/staging/rt3070/firmware.h
 
+rm drivers/staging/rtl8192su/r8192S_FwImgDTM.h
+
 rm drivers/staging/slicoss/*ucode.h
 
 rm drivers/staging/sxg/sxgphycode-1.2.h

Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0	Sat Jul 18 15:48:27 2009	(r13964)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0	Sat Jul 18 15:48:36 2009	(r13965)
@@ -9,6 +9,7 @@
 + debian/dfsg/drivers-staging-rt2860-disable.patch                             
 + debian/dfsg/drivers-staging-rt2870-disable.patch                             
 + debian/dfsg/drivers-staging-rt3070-disable.patch                             
++ debian/dfsg/drivers-staging-rtl8192su-disable.patch
 + debian/dfsg/firmware-cleanup.patch
 + debian/dfsg/sound-pci.patch
 X debian/dfsg/files-1