diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-17 12:52:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-17 12:56:49 +0200 |
| commit | eadb8a091b27a840de7450f84ecff5ef13476424 (patch) | |
| tree | 58c3782d40def63baa8167f3d31e3048cb4c7660 /samples/Kconfig | |
| parent | 73874005cd8800440be4299bd095387fff4b90ac (diff) | |
| parent | 65795efbd380a832ae508b04dba8f8e53f0b84d9 (diff) | |
| download | op-kernel-dev-eadb8a091b27a840de7450f84ecff5ef13476424.zip op-kernel-dev-eadb8a091b27a840de7450f84ecff5ef13476424.tar.gz | |
Merge branch 'linus' into tracing/hw-breakpoints
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/traps.c
arch/x86/power/cpu.c
arch/x86/power/cpu_32.c
kernel/Makefile
Semantic conflict:
arch/x86/kernel/hw_breakpoint.c
Merge reason: Resolve the conflicts, move from put_cpu_no_sched() to
put_cpu() in arch/x86/kernel/hw_breakpoint.c.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'samples/Kconfig')
| -rw-r--r-- | samples/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/samples/Kconfig b/samples/Kconfig index 8458516..17d64ba 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -26,7 +26,8 @@ config SAMPLE_TRACE_EVENTS This build trace event example modules. config SAMPLE_KOBJECT - tristate "Build kobject examples" + tristate "Build kobject examples -- loadable modules only" + depends on m help This config option will allow you to build a number of different kobject sample modules showing how to use kobjects, |
