diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-10-29 19:15:32 -0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-10-29 19:15:32 -0200 |
| commit | 19bf7f8ac3f8131100027281c495dbbe00cd5ae0 (patch) | |
| tree | 270b97e3ca47c0f62a1babca2ae37f79a76a309c /arch/c6x/Kconfig | |
| parent | 787c57c0fb393fe8a3974d300ddcfe30373386fe (diff) | |
| parent | 35fd3dc58da675d659513384221349ef90749a01 (diff) | |
| download | op-kernel-dev-19bf7f8ac3f8131100027281c495dbbe00cd5ae0.zip op-kernel-dev-19bf7f8ac3f8131100027281c495dbbe00cd5ae0.tar.gz | |
Merge remote-tracking branch 'master' into queue
Merge reason: development work has dependency on kvm patches merged
upstream.
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/c6x/Kconfig')
| -rw-r--r-- | arch/c6x/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig index 983c859..aee1b56 100644 --- a/arch/c6x/Kconfig +++ b/arch/c6x/Kconfig @@ -17,6 +17,8 @@ config C6X select OF select OF_EARLY_FLATTREE select GENERIC_CLOCKEVENTS + select GENERIC_KERNEL_THREAD + select MODULES_USE_ELF_RELA config MMU def_bool n |
