---

yaml --- r: 370710 b: refs/heads/master c: 7f01e5a h: refs/heads/master v: v3
git-mirror · Apr 8, 2013 · 970ad2b · 970ad2b
1 parent 8af1b90
commit 970ad2b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 80 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e657bcf6db84864079b31909e911a69c813aa0c0
+refs/heads/master: 7f01e5a7e6a0e99dd9fe9277595953832da8491e
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -900,21 +900,6 @@ config ARCH_U300
 	help
 	  Support for ST-Ericsson U300 series mobile platforms.
 
-config ARCH_U8500
-	bool "ST-Ericsson U8500 Series"
-	depends on MMU
-	select ARCH_HAS_CPUFREQ
-	select ARCH_REQUIRE_GPIOLIB
-	select ARM_AMBA
-	select CLKDEV_LOOKUP
-	select CPU_V7
-	select GENERIC_CLOCKEVENTS
-	select HAVE_SMP
-	select MIGHT_HAVE_CACHE_L2X0
-	select SPARSE_IRQ
-	help
-	  Support for ST-Ericsson's Ux500 architecture
-
 config ARCH_NOMADIK
 	bool "STMicroelectronics Nomadik"
 	select ARCH_REQUIRE_GPIOLIB

diff --git a/trunk/arch/arm/mach-ux500/Kconfig b/trunk/arch/arm/mach-ux500/Kconfig
@@ -1,3 +1,17 @@
+config ARCH_U8500
+	bool "ST-Ericsson U8500 Series" if ARCH_MULTI_V7
+	depends on MMU
+	select ARCH_HAS_CPUFREQ
+	select ARCH_REQUIRE_GPIOLIB
+	select ARM_AMBA
+	select CLKDEV_LOOKUP
+	select CPU_V7
+	select GENERIC_CLOCKEVENTS
+	select HAVE_SMP
+	select MIGHT_HAVE_CACHE_L2X0
+	help
+	  Support for ST-Ericsson's Ux500 architecture
+
 if ARCH_U8500
 
 config UX500_SOC_COMMON

diff --git a/trunk/arch/arm/mach-ux500/include/mach/timex.h b/trunk/arch/arm/mach-ux500/include/mach/timex.h
diff --git a/trunk/arch/arm/mach-ux500/include/mach/uncompress.h b/trunk/arch/arm/mach-ux500/include/mach/uncompress.h