[kernel] r13349 - in dists/trunk/linux-2.6/debian: . bin config patches/debian/dfsg patches/features/all/vserver patches/series

[Bastian Blank]

Author: waldi
Date: Mon Apr  6 10:32:23 2009
New Revision: 13349

Log:
Revert revision 13334.

Deleted:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-me4000-disable.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-slicoss-disable.patch
   dists/trunk/linux-2.6/debian/patches/series/orig-1
Modified:
   dists/trunk/linux-2.6/debian/bin/buildcheck.py   (props changed)
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
   dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch   (props changed)

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Apr  6 09:53:39 2009	(r13348)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Apr  6 10:32:23 2009	(r13349)
@@ -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 at decadent.org.uk>  Sun, 05 Apr 2009 20:08:28 +0100
+ -- maximilian attems <maks at debian.org>  Mon, 30 Mar 2009 14:40:26 +0200
 
 linux-2.6 (2.6.29-1~experimental.1) UNRELEASED; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon Apr  6 09:53:39 2009	(r13348)
+++ dists/trunk/linux-2.6/debian/config/config	Mon Apr  6 10:32:23 2009	(r13349)
@@ -1911,12 +1911,12 @@
 ##
 ## 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

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Mon Apr  6 09:53:39 2009	(r13348)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Mon Apr  6 10:32:23 2009	(r13349)
@@ -57,15 +57,5 @@
 
 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