From fe76301530027a44e34206cba77749fd9d82bdb9 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Thu, 18 Oct 2007 23:41:07 -0700
Subject: [PATCH] --- yaml --- r: 71520 b: refs/heads/master c:
 267c4025f2e198a4e551556a6db31a554ca51814 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/Makefile          |  3 +++
 trunk/lib/Kconfig.debug |  2 ++
 trunk/samples/Kconfig   | 11 +++++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 trunk/samples/Kconfig

diff --git a/[refs] b/[refs]
index b936edbdfe28..bdf615014262 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8256e47cdc8923e9959eb1d7f95d80da538add80
+refs/heads/master: 267c4025f2e198a4e551556a6db31a554ca51814
diff --git a/trunk/Makefile b/trunk/Makefile
index 529b9048d97e..68ef80b30340 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -773,6 +773,9 @@ endef
 vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) vmlinux.o FORCE
 ifdef CONFIG_HEADERS_CHECK
 	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
+endif
+ifdef CONFIG_SAMPLES
+	$(Q)$(MAKE) $(build)=samples
 endif
 	$(call vmlinux-modpost)
 	$(call if_changed_rule,vmlinux__)
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index 7d16e6433302..c567f219191d 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -498,3 +498,5 @@ config FAULT_INJECTION_STACKTRACE_FILTER
 	select FRAME_POINTER
 	help
 	  Provide stacktrace filter for fault-injection capabilities
+
+source "samples/Kconfig"
diff --git a/trunk/samples/Kconfig b/trunk/samples/Kconfig
new file mode 100644
index 000000000000..b46b4cf4382f
--- /dev/null
+++ b/trunk/samples/Kconfig
@@ -0,0 +1,11 @@
+# samples/Kconfig
+
+menuconfig SAMPLES
+	bool "Sample kernel code"
+	help
+	  You can build and test sample kernel code here.
+
+if SAMPLES
+
+
+endif # SAMPLES