diff --git a/[refs] b/[refs]
index 386c89a62616..8e379b34f86d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb3e85fe19575cce8af82bc62a070c72e8f781b8
+refs/heads/master: d431b2e33cd54e4334019a95979ae93aea4735e8
diff --git a/trunk/samples/Kconfig b/trunk/samples/Kconfig
index 52f4264b3006..977980317a7d 100644
--- a/trunk/samples/Kconfig
+++ b/trunk/samples/Kconfig
@@ -62,8 +62,8 @@ config SAMPLE_KDB
 	  command to the kdb shell.
 
 config SAMPLE_HIDRAW
-	tristate "Build simple hidraw example"
-	depends on HIDRAW
+	bool "Build simple hidraw example"
+	depends on HIDRAW && HEADERS_CHECK
 	help
 	  Build an example of how to use hidraw from userspace.
 
diff --git a/trunk/samples/hidraw/Makefile b/trunk/samples/hidraw/Makefile
index 7811cb0289aa..382eeae77bd6 100644
--- a/trunk/samples/hidraw/Makefile
+++ b/trunk/samples/hidraw/Makefile
@@ -6,3 +6,5 @@ hostprogs-y := hid-example
 
 # Tell kbuild to always build the programs
 always := $(hostprogs-y)
+
+HOSTCFLAGS_hid-example.o += -I$(objtree)/usr/include