From 7cae01d5d5394acfb899ceee8b66d9531ee76f50 Mon Sep 17 00:00:00 2001
From: Amerigo Wang <amwang@redhat.com>
Date: Fri, 7 Jan 2011 16:43:54 +0800
Subject: [PATCH] --- yaml --- r: 228991 b: refs/heads/master c:
 d15be32c30e6108cdab76ca895a19b5f8b88b5ca h: refs/heads/master i:   228989:
 2cdc9cb91908a7272c762197209d74d6326d870d   228987:
 96371b2ff5cd043ba1b338e2afe269fb0f4ee48e   228983:
 2f79363c3d3c999bf7bec2749e1dd587355cdcba   228975:
 6e3bb7f9bfd04c79b1d92bfa27d6236d87eeafd3   228959:
 74ed29c1ab1b8744a48add598d2296eadb22686b   228927:
 8825f3ba7bf8b5eb3ac9c8d58adda8dc28bc0c8e   228863:
 40b41663b11443c2202cf53648e27f649b346462 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/microblaze/Kconfig.debug         | 4 ----
 trunk/arch/microblaze/configs/mmu_defconfig | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0bcbf768d809..e8dc260d8743 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20c040ce2176be4be250503497a0a103a3fb3b3e
+refs/heads/master: d15be32c30e6108cdab76ca895a19b5f8b88b5ca
diff --git a/trunk/arch/microblaze/Kconfig.debug b/trunk/arch/microblaze/Kconfig.debug
index e66e25c4b0b2..012e377330cd 100644
--- a/trunk/arch/microblaze/Kconfig.debug
+++ b/trunk/arch/microblaze/Kconfig.debug
@@ -23,8 +23,4 @@ config HEART_BEAT
 	  This option turns on/off heart beat kernel functionality.
 	  First GPIO node is taken.
 
-config DEBUG_BOOTMEM
-	depends on DEBUG_KERNEL
-	bool "Debug BOOTMEM initialization"
-
 endmenu
diff --git a/trunk/arch/microblaze/configs/mmu_defconfig b/trunk/arch/microblaze/configs/mmu_defconfig
index 8b422b12ef78..ab8fbe7ad90b 100644
--- a/trunk/arch/microblaze/configs/mmu_defconfig
+++ b/trunk/arch/microblaze/configs/mmu_defconfig
@@ -66,5 +66,4 @@ CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_EARLY_PRINTK=y
-CONFIG_DEBUG_BOOTMEM=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set