diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-12 15:47:45 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-12 15:47:45 -0800 |
| commit | 8ecba5af948cb58bf6d5eb1537c0df53cbc319c4 (patch) | |
| tree | 83775a334c9e4be97b5dbf3f0a1d86854b10c4c1 /arch/x86/Kconfig | |
| parent | 2b9b6d8c715b23fa119261c32ad360681f4464a9 (diff) | |
| parent | 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39 (diff) | |
| download | op-kernel-dev-8ecba5af948cb58bf6d5eb1537c0df53cbc319c4.zip op-kernel-dev-8ecba5af948cb58bf6d5eb1537c0df53cbc319c4.tar.gz | |
Merge tag 'v3.8-rc7' into x86/asm
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>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3e941aa..430204c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2139,6 +2139,7 @@ config OLPC_XO1_RTC 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 |
