diff --git a/[refs] b/[refs]
index 0f7bdbf56f5b..39d4174c84e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 037776fcbe73236408f6c9ca97c782457efd6b53
+refs/heads/master: 0a6531ebea13b164825ba28e77dcbed3e9386884
diff --git a/trunk/Documentation/timers/Makefile b/trunk/Documentation/timers/Makefile
index c85625f4ab25..73f75f8a87dc 100644
--- a/trunk/Documentation/timers/Makefile
+++ b/trunk/Documentation/timers/Makefile
@@ -2,7 +2,7 @@
 obj- := dummy.o
 
 # List of programs to build
-hostprogs-y := hpet_example
+hostprogs-$(CONFIG_X86) := hpet_example
 
 # Tell kbuild to always build the programs
 always := $(hostprogs-y)