git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
[sfrench/cifs-2.6.git]
/
arch
/
microblaze
/
Kconfig
diff --git
a/arch/microblaze/Kconfig
b/arch/microblaze/Kconfig
index fd53e500be67b21e5d48c96f9e745d8dfa0e158a..b008168ae946b6e479c690911c8d2f0e451b1017 100644
(file)
--- a/
arch/microblaze/Kconfig
+++ b/
arch/microblaze/Kconfig
@@
-90,7
+90,7
@@
source "arch/microblaze/platform/Kconfig.platform"
menu "Processor type and features"
-source
kernel/time/Kconfig
+source
"kernel/time/Kconfig"
source "kernel/Kconfig.preempt"
@@
-130,6
+130,7
@@
config CMDLINE_FORCE
config OF
def_bool y
+ select OF_FLATTREE
config PROC_DEVICETREE
bool "Support for device tree in /proc"