---

yaml --- r: 258814 b: refs/heads/master c: c8b7d43 h: refs/heads/master v: v3
git-mirror · Jul 18, 2011 · 0ebc965 · 0ebc965
1 parent b85b91e
commit 0ebc965
Show file tree

Hide file tree

Showing 24 changed files with 1 addition and 961 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 632b7cf6c056a355fe920c5165c4d7772393b817
+refs/heads/master: c8b7d43b6d539218c36f0ac8a6ad434b93195703
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -490,14 +490,6 @@ config ARCH_KIRKWOOD
 	  Support for the following Marvell Kirkwood series SoCs:
 	  88F6180, 88F6192 and 88F6281.
 
-config ARCH_LOKI
-	bool "Marvell Loki (88RC8480)"
-	select CPU_FEROCEON
-	select GENERIC_CLOCKEVENTS
-	select PLAT_ORION
-	help
-	  Support for the Marvell Loki (88RC8480) SoC.
-
 config ARCH_LPC32XX
 	bool "NXP LPC32XX"
 	select CLKSRC_MMIO
@@ -924,8 +916,6 @@ source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/mach-ks8695/Kconfig"
 
-source "arch/arm/mach-loki/Kconfig"
-
 source "arch/arm/mach-lpc32xx/Kconfig"
 
 source "arch/arm/mach-msm/Kconfig"

diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile
@@ -150,7 +150,6 @@ machine-$(CONFIG_ARCH_IXP23XX)		:= ixp23xx
 machine-$(CONFIG_ARCH_IXP4XX)		:= ixp4xx
 machine-$(CONFIG_ARCH_KIRKWOOD)		:= kirkwood
 machine-$(CONFIG_ARCH_KS8695)		:= ks8695
-machine-$(CONFIG_ARCH_LOKI) 		:= loki
 machine-$(CONFIG_ARCH_LPC32XX)		:= lpc32xx
 machine-$(CONFIG_ARCH_MMP)		:= mmp
 machine-$(CONFIG_ARCH_MSM)		:= msm

diff --git a/trunk/arch/arm/configs/loki_defconfig b/trunk/arch/arm/configs/loki_defconfig
diff --git a/trunk/arch/arm/mach-loki/Kconfig b/trunk/arch/arm/mach-loki/Kconfig
diff --git a/trunk/arch/arm/mach-loki/Makefile b/trunk/arch/arm/mach-loki/Makefile
diff --git a/trunk/arch/arm/mach-loki/Makefile.boot b/trunk/arch/arm/mach-loki/Makefile.boot
diff --git a/trunk/arch/arm/mach-loki/addr-map.c b/trunk/arch/arm/mach-loki/addr-map.c