Merge tag 'v3.8-rc7' into x86/asm
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 12 Feb 2013 23:47:45 +0000 (15:47 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 12 Feb 2013 23:47:45 +0000 (15:47 -0800)
Merge in the updates to head_32.S from the previous urgent branch, as
upcoming patches will make further changes.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
1  2 
arch/x86/Kconfig

diff --combined arch/x86/Kconfig
index 3e941aa7535099a2505f4e3dd9e30a51769605ae,225543bf45a5ca551f9609b18cf8711f729f71e7..430204cfc0f7c28840b0d13240c5bc7fb8ce9992
@@@ -114,7 -114,6 +114,7 @@@ config X8
        select MODULES_USE_ELF_RELA if X86_64
        select CLONE_BACKWARDS if X86_32
        select GENERIC_SIGALTSTACK
 +      select ARCH_USE_BUILTIN_BSWAP
  
  config INSTRUCTION_DECODER
        def_bool y
@@@ -2139,6 -2138,7 +2139,7 @@@ config OLPC_XO1_RT
  config OLPC_XO1_SCI
        bool "OLPC XO-1 SCI extras"
        depends on OLPC && OLPC_XO1_PM
+       depends on INPUT=y
        select POWER_SUPPLY
        select GPIO_CS5535
        select MFD_CORE