On Sat, 28 Mar 2009, Ben Hutchings wrote: > I'd like to commit the following change. Obviously this disables the > drivers and they will have to be modified to work with external firmware. > But I don't see why we should wait for that. > > Ben.
ok for committing to trunk, so that can be sorted for 2.6.30. don't see the need to have to rush that for 2.6.29, who just happened to be uploaded. > Index: debian/changelog > =================================================================== > --- debian/changelog (revision 13283) > +++ debian/changelog (working copy) > @@ -1,4 +1,4 @@ > -linux-2.6 (2.6.29-2) UNRELEASED; urgency=low > +linux-2.6 (2.6.29.dfsg.1-2) UNRELEASED; urgency=low > > [ Martin Michlmayr ] > * [arm/ixp4xx] Build in LEDS_TRIGGER_TIMER (closes: #521141). > @@ -6,8 +6,12 @@ > [ maximilian attems ] > * linux-libc-dev: Bump versioned replaces libdrm-dev. > > - -- Martin Michlmayr <t...@cyrius.com> Wed, 25 Mar 2009 08:57:14 +0100 > + [ Ben Hutchings ] > + * Remove firmware from driver/staging (closes: #521553) > + - Disable affected drivers: rt2860, rt2870 > > + -- Ben Hutchings <b...@decadent.org.uk> Sat, 28 Mar 2009 10:42:00 -0500 > + > linux-2.6 (2.6.29-1) unstable; urgency=low > > * New upstream release > Index: debian/patches/debian/dfsg/drivers-staging-slicoss-disable.patch > =================================================================== > --- debian/patches/debian/dfsg/drivers-staging-slicoss-disable.patch > (revision 0) > +++ debian/patches/debian/dfsg/drivers-staging-slicoss-disable.patch > (revision 0) > @@ -0,0 +1,11 @@ > +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 > Index: debian/patches/debian/dfsg/drivers-staging-otus-disable.patch > =================================================================== > --- debian/patches/debian/dfsg/drivers-staging-otus-disable.patch > (revision 0) > +++ debian/patches/debian/dfsg/drivers-staging-otus-disable.patch > (revision 0) > @@ -0,0 +1,11 @@ > +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--- > Index: debian/patches/debian/dfsg/files-1 > =================================================================== > --- debian/patches/debian/dfsg/files-1 (revision 13283) > +++ debian/patches/debian/dfsg/files-1 (working copy) > @@ -57,5 +57,15 @@ > > 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 > Index: debian/patches/debian/dfsg/drivers-staging-me4000-disable.patch > =================================================================== > --- debian/patches/debian/dfsg/drivers-staging-me4000-disable.patch > (revision 0) > +++ debian/patches/debian/dfsg/drivers-staging-me4000-disable.patch > (revision 0) > @@ -0,0 +1,12 @@ > +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 > Index: debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch > =================================================================== > --- debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch > (revision 0) > +++ debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch > (revision 0) > @@ -0,0 +1,11 @@ > +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. > Index: debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch > =================================================================== > --- debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch > (revision 0) > +++ debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch > (revision 0) > @@ -0,0 +1,11 @@ > +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. > Index: debian/patches/series/orig-1 > =================================================================== > --- debian/patches/series/orig-1 (revision 0) > +++ debian/patches/series/orig-1 (revision 0) > @@ -0,0 +1,21 @@ > ++ 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/firmware-cleanup.patch > ++ debian/dfsg/sound-pci.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 > +X debian/dfsg/files-1 > Index: debian/config/config > =================================================================== > --- debian/config/config (revision 13283) > +++ debian/config/config (working copy) > @@ -1911,12 +1911,12 @@ > ## > ## file: drivers/staging/rt2860/Kconfig > ## > -CONFIG_RT2860=m > +# CONFIG_RT2860 is not set > > ## > ## file: drivers/staging/rt2870/Kconfig > ## > -CONFIG_RT2870=m > +# CONFIG_RT2870 is not set > > ## > ## file: drivers/staging/rtl8187se/Kconfig > > -- > Ben Hutchings > Man invented language to satisfy his deep need to complain. - Lily Tomlin -- maks -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
