Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Russell King [Thu, 25 Feb 2010 20:41:34 +0000 (20:41 +0000)]
1  2 
arch/arm/mach-kirkwood/Kconfig
arch/arm/mach-kirkwood/Makefile

Simple merge
@@@ -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