Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / samples / kobject / Makefile

diff --git a/samples/kobject/Makefile b/samples/kobject/Makefile
index cce16e99fde5199a4da69268611ac78e1e72c539..4a194203c98254078d2a0f625cf9091cc17cd025 100644 (file)
--- a/samples/kobject/Makefile
+++ b/samples/kobject/Makefile
@@ -1 +1 @@
-obj-$(CONFIG_SAMPLE_KOBJECT) += kobject-example.o
+obj-$(CONFIG_SAMPLE_KOBJECT) += kobject-example.o kset-example.o