Merge branch 'misc' into devel

Conflicts: arch/arm/Kconfig
2011-03-16 23:35:25 +00:00
parent 2472f3c8d8 10a8c38398
commit 1f0090a1ea
38 changed files with 462 additions and 792 deletions
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -845,6 +845,11 @@ config CACHE_XSC3L2
 	help
 	  This option enables the L2 cache on XScale3.

+config ARM_L1_CACHE_SHIFT_6
+	bool
+	help
+	  Setting ARM L1 cache line size to 64 Bytes.
+
 config ARM_L1_CACHE_SHIFT
 	int
 	default 6 if ARM_L1_CACHE_SHIFT_6