diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 19:15:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 19:15:12 +0100 |
| commit | e691d24e9c5007486bef59c589c2a2d784e0c30b (patch) | |
| tree | 29e146443430d934f076d89a4bbf035c33586aa9 /arch/x86/Kconfig | |
| parent | Merge branch 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | x86, olpc: Speed up device tree creation during boot (diff) | |
| download | linux-e691d24e9c5007486bef59c589c2a2d784e0c30b.tar.xz linux-e691d24e9c5007486bef59c589c2a2d784e0c30b.zip | |
Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, olpc: Speed up device tree creation during boot
x86, olpc: Add OLPC device-tree support
x86, of: Define irq functions to allow drivers/of/* to build on x86
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 6e15fa9455e0..36ed2e2c896b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2076,11 +2076,17 @@ config OLPC_OPENFIRMWARE bool "Support for OLPC's Open Firmware" depends on !X86_64 && !X86_PAE default n + select OF help This option adds support for the implementation of Open Firmware that is used on the OLPC XO-1 Children's Machine. If unsure, say N here. +config OLPC_OPENFIRMWARE_DT + bool + default y if OLPC_OPENFIRMWARE && PROC_DEVICETREE + select OF_PROMTREE + endif # X86_32 config AMD_NB |