From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 25 Feb 2010 20:41:34 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2a2d10f386c1bacabe1a530c06dc8488eac419e5;p=deliverable%2Flinux.git

Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
---

2a2d10f386c1bacabe1a530c06dc8488eac419e5
diff --cc arch/arm/mach-kirkwood/Makefile
index 55b4ccf3729b,704b8927dbb7..a5530e36ba3e
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@@ -5,10 -5,10 +5,11 @@@ obj-$(CONFIG_MACH_RD88F6192_NAS)	+= rd8
  obj-$(CONFIG_MACH_RD88F6281)		+= rd88f6281-setup.o
  obj-$(CONFIG_MACH_MV88F6281GTW_GE)	+= mv88f6281gtw_ge-setup.o
  obj-$(CONFIG_MACH_SHEEVAPLUG)		+= sheevaplug-setup.o
+ obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)	+= sheevaplug-setup.o
  obj-$(CONFIG_MACH_TS219)		+= ts219-setup.o tsx1x-common.o
  obj-$(CONFIG_MACH_TS41X)		+= ts41x-setup.o tsx1x-common.o
 -obj-$(CONFIG_MACH_OPENRD_BASE)		+= openrd_base-setup.o
 +obj-$(CONFIG_MACH_OPENRD)		+= openrd-setup.o
  obj-$(CONFIG_MACH_NETSPACE_V2)		+= netspace_v2-setup.o
 +obj-$(CONFIG_MACH_INETSPACE_V2)		+= netspace_v2-setup.o
  
  obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o