From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 29 Aug 2005 17:34:31 +0000 (-0700)
Subject: Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-ucb.git
X-Git-Tag: v2.6.14-rc1~1054
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2321fbd2b87539edc1fbfc2e186528a1ef93835f;hp=-c;p=linux-2.6

Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-ucb.git
---

2321fbd2b87539edc1fbfc2e186528a1ef93835f
diff --combined arch/arm/Kconfig
index c65c6eb981,0a7700ae8d..e85097bcef
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -310,7 -310,7 +310,7 @@@ menu "Kernel Features
  
  config SMP
  	bool "Symmetric Multi-Processing (EXPERIMENTAL)"
 -	depends on EXPERIMENTAL #&& n
 +	depends on EXPERIMENTAL && BROKEN #&& n
  	help
  	  This enables support for systems with more than one CPU. If you have
  	  a system with only one CPU, like most personal computers, say N. If
@@@ -752,6 -752,8 +752,8 @@@ source "drivers/hwmon/Kconfig
  
  source "drivers/misc/Kconfig"
  
+ source "drivers/mfd/Kconfig"
+ 
  source "drivers/media/Kconfig"
  
  source "drivers/video/Kconfig"