From 54bcf5dec5f6bb251d30ea0e65fa6acce0154caf Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri, 2 May 2008 21:14:20 +1000
Subject: [PATCH] --- yaml --- r: 95991 b: refs/heads/master c:
 afaafe50ee15c59010f19273ebfb6c44f0962d7c h: refs/heads/master i:   95989:
 7d532c5d84fc86cccc6c76ba8f85cc511134930a   95987:
 75881d8352524321ce35032c6b55e164d04fbdb9   95983:
 ba406662ca624df57b5d4fb543dd9ca9ef802487 v: v3

---
 [refs]                            | 2 +-
 trunk/include/asm-x86/bootparam.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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 {