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: Constify an olpc_ofw() arg
  x86, olpc: Use pr_debug() for EC commands
  x86, olpc: Add comment about implicit optimization barrier
  x86, olpc: Add support for calling into OpenFirmware

1 files changed, 9 insertions, 0 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index baa34e510222..a84fc34c8f77 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2060,6 +2060,15 @@ config OLPC
           Add support for detecting the unique features of the OLPC
           XO hardware.
 
+config OLPC_OPENFIRMWARE
+        bool "Support for OLPC's Open Firmware"
+        depends on !X86_64 && !X86_PAE
+        default y if OLPC
+        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.
+
 endif # X86_32
 
 config K8_NB