diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/asm-x86/bootparam.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-x86/bootparam.h')
| -rw-r--r-- | include/asm-x86/bootparam.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-x86/bootparam.h b/include/asm-x86/bootparam.h index e8659909e5f6..f62f4733606b 100644 --- a/include/asm-x86/bootparam.h +++ b/include/asm-x86/bootparam.h | |||
| @@ -14,10 +14,10 @@ | |||
| 14 | 14 | ||
| 15 | /* extensible setup data list node */ | 15 | /* extensible setup data list node */ |
| 16 | struct setup_data { | 16 | struct setup_data { |
| 17 | u64 next; | 17 | __u64 next; |
| 18 | u32 type; | 18 | __u32 type; |
| 19 | u32 len; | 19 | __u32 len; |
| 20 | u8 data[0]; | 20 | __u8 data[0]; |
| 21 | }; | 21 | }; |
| 22 | 22 | ||
| 23 | struct setup_header { | 23 | struct setup_header { |