[kernel] r15629 - in dists/trunk/linux-2.6/debian/patches: debian series

[Maximilian Attems]

Author: maks
Date: Wed May  5 21:51:33 2010
New Revision: 15629

Log:
add fixed patch that applies

rm reference to merged patch

Modified:
   dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.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	Wed May  5 21:44:47 2010	(r15628)
+++ dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch	Wed May  5 21:51:33 2010	(r15629)
@@ -25,9 +25,9 @@
 +updateoldconfig: $(obj)/conf
 +	$< -U $(Kconfig)
 +
- localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
- 	$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
- 	$(Q)if [ -f .config ]; then 				\
+ # if no path is given, then use src directory to find file
+ ifdef LSMOD
+ LSMOD_F := $(LSMOD)
 diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
 index 3e1057f..e526d00 100644
 --- a/scripts/kconfig/conf.c

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Wed May  5 21:44:47 2010	(r15628)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Wed May  5 21:51:33 2010	(r15629)
@@ -37,8 +37,6 @@
 
 + features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
 
-+ bugfix/ia65/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch
-
 + debian/sysrq-mask.patch
 
 #+ features/arm/dns323-rev-a1-powerled.patch