diff --git a/[refs] b/[refs]
index 533ab52cf559..386c89a62616 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a978c50c6cff743c3516ffa6d2ce44382e7b70b
+refs/heads/master: cb3e85fe19575cce8af82bc62a070c72e8f781b8
diff --git a/trunk/samples/hidraw/hid-example.c b/trunk/samples/hidraw/hid-example.c
index 40e3d6200582..816e2dcda7ca 100644
--- a/trunk/samples/hidraw/hid-example.c
+++ b/trunk/samples/hidraw/hid-example.c
@@ -14,6 +14,17 @@
 #include <linux/input.h>
 #include <linux/hidraw.h>
 
+/*
+ * Ugly hack to work around failing compilation on systems that don't
+ * yet populate new version of hidraw.h to userspace.
+ *
+ * If you need this, please have your distro update the kernel headers.
+ */
+#ifndef HIDIOCSFEATURE
+#define HIDIOCSFEATURE(len)    _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len)
+#define HIDIOCGFEATURE(len)    _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x07, len)
+#endif
+
 /* Unix */
 #include <sys/ioctl.h>
 #include <sys/types.h>