[kernel] r14717 - in dists/trunk/linux-2.6/debian/patches: bugfix/all bugfix/arm bugfix/mips debian features/arm series

[Bastian Blank]

Author: waldi
Date: Thu Dec  3 08:12:24 2009
New Revision: 14717

Log:
debian/patches: Fix patches, remove merged patches.

Deleted:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/mac80211-fix-spurious-delBA-handling.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/all/mac80211-fix-two-remote-exploits.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/videobuf-dma-build-fix.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/ip22-no-early-printk.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
   dists/trunk/linux-2.6/debian/patches/features/arm/ts41x.patch
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch	Thu Dec  3 07:48:51 2009	(r14716)
+++ dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch	Thu Dec  3 08:12:24 2009	(r14717)
@@ -25,7 +25,7 @@
 +	$< -U $(Kconfig)
 +
  localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
- 	$(Q)perl $< $(Kconfig) > .tmp.config
+ 	$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
  	$(Q)if [ -f .config ]; then 				\
 diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
 index 3e1057f..e526d00 100644

Modified: dists/trunk/linux-2.6/debian/patches/features/arm/ts41x.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/arm/ts41x.patch	Thu Dec  3 07:48:51 2009	(r14716)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/ts41x.patch	Thu Dec  3 08:12:24 2009	(r14717)
@@ -285,10 +285,3 @@
 +	.init_irq	= kirkwood_init_irq,
 +	.timer		= &kirkwood_timer,
 +MACHINE_END
---- a/arch/arm/tools/mach-types
-+++ b/arch/arm/tools/mach-types
-@@ -2421,3 +2421,4 @@
- mh355			MACH_MH355		MH355			2435
- pc7802			MACH_PC7802		PC7802			2436
- gnet_sgc		MACH_GNET_SGC		GNET_SGC		2437
-+ts41x			MACH_TS41X		TS41X			2502

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Thu Dec  3 07:48:51 2009	(r14716)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Thu Dec  3 08:12:24 2009	(r14717)
@@ -34,7 +34,6 @@
 + bugfix/sparc/drivers_net-broken.patch
 #+ bugfix/ia64/hardcode-arch-script-output.patch
 + bugfix/mips/disable-advansys.patch
-+ bugfix/mips/ip22-no-early-printk.patch
 + bugfix/arm/disable-scsi_acard.patch
 + bugfix/mips/disable-werror.patch
 + bugfix/fix-hifn_795X-divdi3.patch
@@ -48,11 +47,8 @@
 + features/arm/compression-add-lzmo.patch
 + features/arm/openrd-client.patch
 + features/arm/ts41x.patch
-+ bugfix/arm/videobuf-dma-build-fix.patch
 + bugfix/arm/scsi-osd-build-fix.patch
 + bugfix/mips/drm-ttm-build-fix.patch
 + bugfix/all/DocBook-media-copy-images-after-building-HTML.patch
 + bugfix/all/DocBook-media-create-links-for-included-sources.patch
 + features/all/mmc-parameter-set-whether-cards-are-assumed-removable.patch
-+ bugfix/all/mac80211-fix-two-remote-exploits.patch
-+ bugfix/all/mac80211-fix-spurious-delBA-handling.patch