Revert revision 13334.
svn path=/dists/trunk/linux-2.6/; revision=13349
This commit is contained in:
Bastian Blank
parent
307ea1b234
commit
6832dd13f3
|
|
@ -1,19 +1,14 @@
|
|||
linux-2.6 (2.6.29.dfsg.1-1~experimental.2) UNRELEASED; urgency=low
|
||||
linux-2.6 (2.6.29-1~experimental.2) UNRELEASED; urgency=low
|
||||
|
||||
* New upstream release
|
||||
- radeonfb: suspend/resume for ATI Mobility Radeon RV350.
|
||||
(closes: #506964)
|
||||
|
||||
[ maximilian attems ]
|
||||
* [sparc] Enable BLK_DEV_CRYPTOLOOP. (closes: #521829)
|
||||
* Enable PATA_JMICRON instead of legacy BLK_DEV_JMICRON.
|
||||
(closes: #431500, #458493)
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* Remove firmware from driver/staging (closes: #521553)
|
||||
- Disable affected drivers: rt2860, rt2870
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Sun, 05 Apr 2009 20:08:28 +0100
|
||||
-- maximilian attems <maks@debian.org> Mon, 30 Mar 2009 14:40:26 +0200
|
||||
|
||||
linux-2.6 (2.6.29-1~experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
|
|
|
|||
|
|
@ -1911,12 +1911,12 @@ CONFIG_ET131X=m
|
|||
##
|
||||
## file: drivers/staging/rt2860/Kconfig
|
||||
##
|
||||
# CONFIG_RT2860 is not set
|
||||
CONFIG_RT2860=m
|
||||
|
||||
##
|
||||
## file: drivers/staging/rt2870/Kconfig
|
||||
##
|
||||
# CONFIG_RT2870 is not set
|
||||
CONFIG_RT2870=m
|
||||
|
||||
##
|
||||
## file: drivers/staging/rtl8187se/Kconfig
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/drivers/staging/me4000/Kconfig b/drivers/staging/me4000/Kconfig
|
||||
index 5e6c9de..45d2ea9 100644
|
||||
--- a/drivers/staging/me4000/Kconfig
|
||||
+++ b/drivers/staging/me4000/Kconfig
|
||||
@@ -1,6 +1,7 @@
|
||||
config ME4000
|
||||
tristate "Meilhaus ME-4000 support"
|
||||
default n
|
||||
+ depends on BROKEN
|
||||
depends on PCI
|
||||
help
|
||||
This driver supports the Meilhaus ME-4000 family of boards
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff --git a/drivers/staging/otus/Kconfig b/drivers/staging/otus/Kconfig
|
||||
index d549d08..fef9785 100644
|
||||
--- a/drivers/staging/otus/Kconfig
|
||||
+++ b/drivers/staging/otus/Kconfig
|
||||
@@ -1,5 +1,6 @@
|
||||
config OTUS
|
||||
tristate "Atheros OTUS 802.11n USB wireless support"
|
||||
+ depends on BROKEN
|
||||
depends on USB && WLAN_80211 && MAC80211
|
||||
default N
|
||||
---help---
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff --git a/drivers/staging/rt2860/Kconfig b/drivers/staging/rt2860/Kconfig
|
||||
index 7f44e5e..9fb130d 100644
|
||||
--- a/drivers/staging/rt2860/Kconfig
|
||||
+++ b/drivers/staging/rt2860/Kconfig
|
||||
@@ -1,5 +1,6 @@
|
||||
config RT2860
|
||||
tristate "Ralink 2860 wireless support"
|
||||
+ depends on BROKEN
|
||||
depends on PCI && X86 && WLAN_80211
|
||||
---help---
|
||||
This is an experimental driver for the Ralink 2860 wireless chip.
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff --git a/drivers/staging/rt2870/Kconfig b/drivers/staging/rt2870/Kconfig
|
||||
index 8398d97..cd4f0b6 100644
|
||||
--- a/drivers/staging/rt2870/Kconfig
|
||||
+++ b/drivers/staging/rt2870/Kconfig
|
||||
@@ -1,5 +1,6 @@
|
||||
config RT2870
|
||||
tristate "Ralink 2870 wireless support"
|
||||
+ depends on BROKEN
|
||||
depends on USB && X86 && WLAN_80211
|
||||
---help---
|
||||
This is an experimental driver for the Ralink 2870 wireless chip.
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff --git a/drivers/staging/slicoss/Kconfig b/drivers/staging/slicoss/Kconfig
|
||||
index d2993d3..2b510e0 100644
|
||||
--- a/drivers/staging/slicoss/Kconfig
|
||||
+++ b/drivers/staging/slicoss/Kconfig
|
||||
@@ -1,5 +1,6 @@
|
||||
config SLICOSS
|
||||
tristate "Alacritech Gigabit IS-NIC support"
|
||||
+ depends on BROKEN
|
||||
depends on PCI && X86 && NETDEV_1000
|
||||
default n
|
||||
help
|
||||
|
|
@ -57,15 +57,5 @@ rm drivers/scsi/ql1280_fw.h
|
|||
|
||||
rm drivers/scsi/qlogicpti_asm.c
|
||||
|
||||
rm drivers/staging/me4000/me*_firmware.h
|
||||
|
||||
rm drivers/staging/otus/hal/hp*fw*.c
|
||||
|
||||
rm drivers/staging/rt2860/common/firmware.h
|
||||
|
||||
rm drivers/staging/rt2870/common/firmware.h
|
||||
|
||||
rm drivers/staging/slicoss/*ucode.h
|
||||
|
||||
rm sound/pci/cs46xx/cs46xx_image.h
|
||||
rm sound/pci/cs46xx/imgs
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
+ debian/dfsg/drivers-gpu-drm-mga-disable.patch
|
||||
+ debian/dfsg/drivers-gpu-drm-r128-disable.patch
|
||||
+ debian/dfsg/drivers-gpu-drm-radeon-disable.patch
|
||||
+ debian/dfsg/drivers-net-bnx2-disable.patch
|
||||
+ debian/dfsg/drivers-net-bnx2x-disable.patch
|
||||
+ debian/dfsg/drivers-net-appletalk-cops.patch
|
||||
+ debian/dfsg/drivers-net-hamradio-yam.patch
|
||||
+ debian/dfsg/drivers-net-myri.patch
|
||||
+ debian/dfsg/drivers-net-tehuti-disable.patch
|
||||
+ debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
|
||||
+ debian/dfsg/drivers-net-typhoon-disable.patch
|
||||
+ debian/dfsg/drivers-scsi-qla1280-disable.patch
|
||||
+ debian/dfsg/drivers-scsi-qlogicpti.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-slicoss-disable.patch
|
||||
+ debian/dfsg/firmware-cleanup.patch
|
||||
+ debian/dfsg/sound-pci.patch
|
||||
X debian/dfsg/files-1
|
||||
Loading…
Reference in New Issue