Remove firmware for enp2611_mod and rt3070sta; mark the drivers broken

svn path=/dists/trunk/linux-2.6/; revision=13416
This commit is contained in:
Ben Hutchings 2009-04-13 04:06:50 +00:00
parent 8ffed0dad7
commit 08d80ba451
5 changed files with 29 additions and 0 deletions

1
debian/changelog vendored
View File

@ -13,6 +13,7 @@ linux-2.6 (2.6.30~rc1-1~experimental.1) UNRELEASED; urgency=low
* Remove firmware from driver/staging (closes: #521553)
- make rt2860sta and rt2870sta use request_firmware(),
thanks to Darren Salt
* Remove firmware from enp2611_mod (not included in Debian kernel images)
[ Martin Michlmayr ]
* [arm/orion5x] Enable CONFIG_SENSORS_G760A used on the D-Link DNS-323.

View File

@ -0,0 +1,11 @@
diff --git a/drivers/net/ixp2000/Kconfig b/drivers/net/ixp2000/Kconfig
index 2fec241..2c7f354 100644
--- a/drivers/net/ixp2000/Kconfig
+++ b/drivers/net/ixp2000/Kconfig
@@ -1,5 +1,6 @@
config ENP2611_MSF_NET
tristate "Radisys ENP2611 MSF network interface support"
+ depends on BROKEN
depends on ARCH_ENP2611
help
This is a driver for the MSF network interface unit in

View File

@ -0,0 +1,11 @@
diff --git a/drivers/staging/rt3070/Kconfig b/drivers/staging/rt3070/Kconfig
index b37fb5d..e414305 100644
--- a/drivers/staging/rt3070/Kconfig
+++ b/drivers/staging/rt3070/Kconfig
@@ -1,5 +1,6 @@
config RT3070
tristate "Ralink 3070 wireless support"
+ depends on BROKEN
depends on USB && X86 && WLAN_80211
---help---
This is an experimental driver for the Ralink 3070 wireless chip.

View File

@ -44,6 +44,8 @@ rm drivers/net/appletalk/cops_ltdrv.h
rm drivers/net/bnx2x_init_values.h
rm drivers/net/ixp2000/*.ucode
rm drivers/staging/me4000/me*_firmware.h
rm drivers/staging/otus/hal/hp*fw*.c
@ -52,6 +54,8 @@ rm drivers/staging/rt2860/common/firmware.h
rm drivers/staging/rt2870/common/firmware.h
rm drivers/staging/rt3070/firmware.h
rm drivers/staging/slicoss/*ucode.h
rm sound/pci/cs46xx/cs46xx_image.h

View File

@ -3,10 +3,12 @@
+ debian/dfsg/drivers-gpu-drm-radeon-disable.patch
+ debian/dfsg/drivers-net-bnx2x-disable.patch
+ debian/dfsg/drivers-net-appletalk-cops.patch
+ debian/dfsg/drivers-net-ixp2000-disable.patch
+ debian/dfsg/drivers-staging-me4000-disable.patch
+ debian/dfsg/drivers-staging-otus-disable.patch
+ debian/dfsg/drivers-staging-rt2860-disable.patch
+ debian/dfsg/drivers-staging-rt2870-disable.patch
+ debian/dfsg/drivers-staging-rt3070-disable.patch
+ debian/dfsg/firmware-cleanup.patch
+ debian/dfsg/sound-pci.patch
X debian/dfsg/files-1