---

yaml --- r: 258222 b: refs/heads/master c: 10cdc7e h: refs/heads/master v: v3
git-mirror · Jul 6, 2011 · ed2c0e1 · ed2c0e1
1 parent 7d6690c
commit ed2c0e1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eca5dc2a0028d64229aef1b7839bcbae1d864c5f
+refs/heads/master: 10cdc7e5129ac26aefece4c7a7d5b1a0285237c2
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -1349,7 +1349,6 @@ config SMP_ON_UP
 
 config HAVE_ARM_SCU
 	bool
-	depends on SMP
 	help
 	  This option enables support for the ARM system coherency unit
 

diff --git a/trunk/arch/arm/kernel/smp_scu.c b/trunk/arch/arm/kernel/smp_scu.c
@@ -20,6 +20,7 @@
 #define SCU_INVALIDATE		0x0c
 #define SCU_FPGA_REVISION	0x10
 
+#ifdef CONFIG_SMP
 /*
  * Get the number of CPU cores from the SCU configuration
  */
@@ -50,6 +51,7 @@ void __init scu_enable(void __iomem *scu_base)
 	 */
 	flush_cache_all();
 }
+#endif
 
 /*
  * Set the executing CPUs power mode as defined.  This will be in
-Original file line number
+Diff line change
@@ Expand Up / @@ -1349,7 +1349,6 @@ config SMP_ON_UP @@
     config HAVE_ARM_SCU
     	bool
-    	depends on SMP
     	help
     	  This option enables support for the ARM system coherency unit
@@ Expand Down @@