diff --git a/[refs] b/[refs]
index 5560b110fc80..a2cd8d8ebc16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80c1c16fb89e7055acb560e6d90c881b5c7496c1
+refs/heads/master: 1deacd7a1d4bb22f812908c34e3254de76e4faa8
diff --git a/trunk/drivers/mtd/ubi/Kconfig.debug b/trunk/drivers/mtd/ubi/Kconfig.debug
index 2246f154e2f7..61f6e5e40458 100644
--- a/trunk/drivers/mtd/ubi/Kconfig.debug
+++ b/trunk/drivers/mtd/ubi/Kconfig.debug
@@ -6,7 +6,7 @@ config MTD_UBI_DEBUG
 	depends on SYSFS
 	depends on MTD_UBI
 	select DEBUG_FS
-	select KALLSYMS_ALL
+	select KALLSYMS_ALL if KALLSYMS && DEBUG_KERNEL
 	help
 	  This option enables UBI debugging.