diff --git a/[refs] b/[refs]
index e9b4e837e095..1260aed4b8e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd5e73794c9af30d6491963e13436d9f05ee6df6
+refs/heads/master: 5ab5fc7e35705cf1a8a506d8e8b71acc27feec75
diff --git a/trunk/arch/microblaze/Kconfig b/trunk/arch/microblaze/Kconfig
index 1a8f682248ce..971f86760d83 100644
--- a/trunk/arch/microblaze/Kconfig
+++ b/trunk/arch/microblaze/Kconfig
@@ -77,9 +77,6 @@ config LOCKDEP_SUPPORT
 config HAVE_LATENCYTOP_SUPPORT
 	def_bool y
 
-config DTC
-	def_bool y
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
index 402f4c028eb8..9b8e479c39da 100644
--- a/trunk/arch/powerpc/Kconfig
+++ b/trunk/arch/powerpc/Kconfig
@@ -196,10 +196,6 @@ config SYS_SUPPORTS_APM_EMULATION
 	default y if PMAC_APM_EMU
 	bool
 
-config DTC
-       bool
-       default y
-
 config DEFAULT_UIMAGE
 	bool
 	help
diff --git a/trunk/drivers/of/Kconfig b/trunk/drivers/of/Kconfig
index d836b47d0be5..ae2d4ad67bd0 100644
--- a/trunk/drivers/of/Kconfig
+++ b/trunk/drivers/of/Kconfig
@@ -1,46 +1,53 @@
+config DTC
+	bool
+
 config OF
 	bool
 
+menu "Flattened Device Tree and Open Firmware support"
+	depends on OF
+
 config OF_FLATTREE
 	bool
-	depends on OF
+	select DTC
 
 config OF_DYNAMIC
 	def_bool y
-	depends on OF && PPC_OF
+	depends on PPC_OF
 
 config OF_ADDRESS
 	def_bool y
-	depends on OF && !SPARC
+	depends on !SPARC
 
 config OF_IRQ
 	def_bool y
-	depends on OF && !SPARC
+	depends on !SPARC
 
 config OF_DEVICE
 	def_bool y
-	depends on OF && (SPARC || PPC_OF || MICROBLAZE)
 
 config OF_GPIO
 	def_bool y
-	depends on OF && (PPC_OF || MICROBLAZE) && GPIOLIB
+	depends on GPIOLIB && !SPARC
 	help
 	  OpenFirmware GPIO accessors
 
 config OF_I2C
 	def_tristate I2C
-	depends on OF && !SPARC && I2C
+	depends on I2C && !SPARC
 	help
 	  OpenFirmware I2C accessors
 
 config OF_SPI
 	def_tristate SPI
-	depends on OF && (PPC_OF || MICROBLAZE) && SPI
+	depends on SPI && !SPARC
 	help
 	  OpenFirmware SPI accessors
 
 config OF_MDIO
 	def_tristate PHYLIB
-	depends on OF && PHYLIB
+	depends on PHYLIB
 	help
 	  OpenFirmware MDIO bus (Ethernet PHY) accessors
+
+endmenu # OF