diff --git a/[refs] b/[refs]
index 4391af3f917a..ca23f3ca10f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bd1796dedd50abd7553afbe6113bd97cc88390f
+refs/heads/master: afaafe50ee15c59010f19273ebfb6c44f0962d7c
diff --git a/trunk/include/asm-x86/bootparam.h b/trunk/include/asm-x86/bootparam.h
index e8659909e5f6..f62f4733606b 100644
--- a/trunk/include/asm-x86/bootparam.h
+++ b/trunk/include/asm-x86/bootparam.h
@@ -14,10 +14,10 @@
 
 /* extensible setup data list node */
 struct setup_data {
-	u64 next;
-	u32 type;
-	u32 len;
-	u8 data[0];
+	__u64 next;
+	__u32 type;
+	__u32 len;
+	__u8 data[0];
 };
 
 struct setup_header {