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

[Ben Hutchings]

Author: benh
Date: Fri Feb 19 03:30:53 2010
New Revision: 15214

Log:
Fix up features/arm/openrd-client.patch for 2.6.33-rc8

Modified:
   dists/trunk/linux-2.6/debian/patches/features/arm/openrd-client.patch
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/patches/features/arm/openrd-client.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/arm/openrd-client.patch	Fri Feb 19 03:24:44 2010	(r15213)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/openrd-client.patch	Fri Feb 19 03:30:53 2010	(r15214)
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-kirkwood/Kconfig	2009-09-25 19:49:01.000000000 +0000
 +++ b/arch/arm/mach-kirkwood/Kconfig	2009-09-25 19:50:08.000000000 +0000
-@@ -44,6 +44,12 @@
+@@ -52,6 +52,12 @@
  	  Say 'Y' here if you want your kernel to support the
  	  Marvell OpenRD Base Board.
  
@@ -10,16 +10,17 @@
 +	  Say 'Y' here if you want your kernel to support the
 +	  Marvell OpenRD Client Board.
 +
- endmenu
- 
- endif
+ config MACH_NETSPACE_V2
+ 	bool "LaCie Network Space v2 NAS Board"
+ 	help
 --- a/arch/arm/mach-kirkwood/Makefile	2009-09-25 19:49:07.000000000 +0000
 +++ b/arch/arm/mach-kirkwood/Makefile	2009-09-25 19:49:29.000000000 +0000
-@@ -7,5 +7,6 @@
- obj-$(CONFIG_MACH_SHEEVAPLUG)		+= sheevaplug-setup.o
+@@ -8,6 +8,7 @@
  obj-$(CONFIG_MACH_TS219)		+= ts219-setup.o
+ obj-$(CONFIG_MACH_TS41X)		+= ts41x-setup.o tsx1x-common.o
  obj-$(CONFIG_MACH_OPENRD_BASE)		+= openrd_base-setup.o
 +obj-$(CONFIG_MACH_OPENRD_CLIENT)	+= openrd_client-setup.o
+ obj-$(CONFIG_MACH_NETSPACE_V2)		+= netspace_v2-setup.o
  
  obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o
 --- /dev/null	2008-06-15 07:07:41.000000000 +0000

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 03:24:44 2010	(r15213)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 03:30:53 2010	(r15214)
@@ -40,8 +40,8 @@
 + bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch 
 + debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch
 + features/arm/compression-add-lzma.patch
++ features/arm/openrd-client.patch
 # FIXME: no longer applies
-#+ features/arm/openrd-client.patch
 #+ features/arm/ts41x.patch
 #+ features/all/mmc-parameter-set-whether-cards-are-assumed-removable.patch