Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* '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

diff --combined arch/x86/Kconfig
index baa34e5102222f29cb1f3741e051f75ffdf67a45,71c194db2e0ad4b6598b65f3f2b60665ae7f10e0..a84fc34c8f777c54eb707abe6b43c19a025c75f0
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -55,7 -55,6 +55,7 @@@ config X8
        select HAVE_HW_BREAKPOINT
        select HAVE_MIXED_BREAKPOINTS_REGS
        select PERF_EVENTS
 +      select HAVE_PERF_EVENTS_NMI
        select ANON_INODES
        select HAVE_ARCH_KMEMCHECK
        select HAVE_USER_RETURN_NOTIFIER
@@@ -73,6 -72,9 +73,6 @@@ config ARCH_DEFCONFI
        default "arch/x86/configs/i386_defconfig" if X86_32
        default "arch/x86/configs/x86_64_defconfig" if X86_64
  
 -config GENERIC_TIME
 -      def_bool y
 -
  config GENERIC_CMOS_UPDATE
        def_bool y
  
@@@ -2044,7 -2046,7 +2044,7 @@@ config SCx20
  
  config SCx200HR_TIMER
        tristate "NatSemi SCx200 27MHz High-Resolution Timer Support"
 -      depends on SCx200 && GENERIC_TIME
 +      depends on SCx200
        default y
        ---help---
          This driver provides a clocksource built upon the on-chip
@@@ -2060,6 -2062,15 +2060,15 @@@ config OLP
          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