[kernel] r13221 - in dists/trunk/linux-2.6/debian/patches: features/arm series

[Maximilian Attems]

Author: maks
Date: Tue Mar 24 00:57:55 2009
New Revision: 13221

Log:
make ts219.patch apply cleanly

enable prepared patch hunk for arch/arm/tools/mach-types

Modified:
   dists/trunk/linux-2.6/debian/patches/features/arm/ts219.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/patches/features/arm/ts219.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/arm/ts219.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/ts219.patch	Tue Mar 24 00:57:55 2009
@@ -264,15 +264,7 @@
 +MACHINE_END
 --- a/arch/arm/tools/mach-types	2009-03-22 20:42:58.000000000 +0000
 +++ b/arch/arm/tools/mach-types	2009-03-22 20:43:18.000000000 +0000
-@@ -1995,3 +1995,4 @@
- linkstation_ls_hgl	MACH_LINKSTATION_LS_HGL	LINKSTATION_LS_HGL	2005
- htcvenus		MACH_HTCVENUS		HTCVENUS		2006
- sheevaplug		MACH_SHEEVAPLUG		SHEEVAPLUG		2097
-+ts219			MACH_TS219		TS219			2139
-
-#--- a/arch/arm/tools/mach-types
-#+++ b/arch/arm/tools/mach-types
-#@@ -2124,3 +2124,4 @@ mx27wallace		MACH_MX27WALLACE	MX27WALLACE		2133
+@@ -2124,3 +2124,4 @@ mx27wallace		MACH_MX27WALLACE	MX27WALLACE		2133
  fmzwebmodul		MACH_FMZWEBMODUL	FMZWEBMODUL		2134
  rd78x00_masa		MACH_RD78X00_MASA	RD78X00_MASA		2135
  smallogger		MACH_SMALLOGGER		SMALLOGGER		2136

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Tue Mar 24 00:57:55 2009
@@ -38,4 +38,4 @@
 + features/arm/kw-hook-up-i2c.patch
 + features/arm/kw-dont-init-rtc.patch
 + features/arm/kw-consistency-mpp.patch
-#+ features/arm/ts219.patch
++ features/arm/ts219.patch