projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f68ffd c499546)
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 20:41:34 +0000 (20:41 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 20:41:34 +0000 (20:41 +0000)
1  2 
arch/arm/mach-kirkwood/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/mach-kirkwood/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-kirkwood/Kconfig
Simple merge
diff --cc arch/arm/mach-kirkwood/Makefile
index 55b4ccf3729ba080d2d164a3f75e48bdc75ec4b5,704b8927dbb7f1e3ef20613539ab7a46c2b61f7b..a5530e36ba3eab57e06b38b7ba1e8b7b87732ca9
--- 1/arch/arm/mach-kirkwood/Makefile
--- 2/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