diff --git a/[refs] b/[refs]
index 52718edc09ca..b80a22c0b8f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d48444cf39161bca014b9f6402e409d3e193e530
+refs/heads/master: 634bd40a894d64df09ba36c12bb6e70787989ba9
diff --git a/trunk/arch/openrisc/kernel/asm-offsets.c b/trunk/arch/openrisc/kernel/asm-offsets.c
index 1a242a0d7583..ddb736855863 100644
--- a/trunk/arch/openrisc/kernel/asm-offsets.c
+++ b/trunk/arch/openrisc/kernel/asm-offsets.c
@@ -34,15 +34,11 @@
 #include <linux/mm.h>
 #include <linux/io.h>
 #include <linux/thread_info.h>
+#include <linux/kbuild.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 
-#define DEFINE(sym, val) \
-		asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 int main(void)
 {
 	/* offsets into the task_struct */