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

[Maximilian Attems]

Author: maks
Date: Tue Mar 24 00:53:54 2009
New Revision: 13220

Log:
arm: fix sheevaplug patch to apply

305b07680f6c6a7e59f996c5bd85f009caff5bb1 added sheevaplug to mach-types
no need to patch it.

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

Modified: dists/trunk/linux-2.6/debian/patches/features/arm/kw-sheevaplug.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/arm/kw-sheevaplug.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/kw-sheevaplug.patch	Tue Mar 24 00:53:54 2009
@@ -138,12 +138,3 @@
 +	.init_irq	= kirkwood_init_irq,
 +	.timer		= &kirkwood_timer,
 +MACHINE_END
-diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
-index fd23c0e..1fbfcac 100644
---- a/arch/arm/tools/mach-types
-+++ b/arch/arm/tools/mach-types
-@@ -1994,3 +1994,4 @@ benzina			MACH_BENZINA		BENZINA			2003
- blaze			MACH_BLAZE		BLAZE			2004
- linkstation_ls_hgl	MACH_LINKSTATION_LS_HGL	LINKSTATION_LS_HGL	2005
- htcvenus		MACH_HTCVENUS		HTCVENUS		2006
-+sheevaplug		MACH_SHEEVAPLUG		SHEEVAPLUG		2097

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:53:54 2009
@@ -32,10 +32,10 @@
 + features/arm/mv-sdio.patch
 + features/arm/kw-register-sdio.patch
 + features/arm/kw-register-internal-devices.patch
-#+ features/arm/kw-sheevaplug.patch
-#+ features/arm/kw-sheevaplug-usb-power.patch
-#+ features/arm/kw-sheevaplug-led.patch
++ features/arm/kw-sheevaplug.patch
++ features/arm/kw-sheevaplug-usb-power.patch
++ features/arm/kw-sheevaplug-led.patch
 + features/arm/kw-hook-up-i2c.patch
-#+ features/arm/kw-dont-init-rtc.patch
++ features/arm/kw-dont-init-rtc.patch
 + features/arm/kw-consistency-mpp.patch
 #+ features/arm/ts219.patch