From f5b41f2c17ae2734a0f6af9c781322b6202651af Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 25 Jul 2007 11:06:02 -0700 Subject: [PATCH] --- yaml --- r: 62918 b: refs/heads/master c: 4bf3b0bc3e98f77de88b336fd8d673649601b557 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/apm_bios.h | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 2c1bfe081634..3f30fb79b4ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 238b706da1c6ebacc55986ac8668f3ede4621f2c +refs/heads/master: 4bf3b0bc3e98f77de88b336fd8d673649601b557 diff --git a/trunk/include/linux/apm_bios.h b/trunk/include/linux/apm_bios.h index 290aef326812..5f921c84827a 100644 --- a/trunk/include/linux/apm_bios.h +++ b/trunk/include/linux/apm_bios.h @@ -21,20 +21,22 @@ typedef unsigned short apm_eventinfo_t; #ifdef __KERNEL__ +#include + #define APM_CS (GDT_ENTRY_APMBIOS_BASE * 8) #define APM_CS_16 (APM_CS + 8) #define APM_DS (APM_CS_16 + 8) struct apm_bios_info { - unsigned short version; - unsigned short cseg; - unsigned long offset; - unsigned short cseg_16; - unsigned short dseg; - unsigned short flags; - unsigned short cseg_len; - unsigned short cseg_16_len; - unsigned short dseg_len; + u16 version; + u16 cseg; + u32 offset; + u16 cseg_16; + u16 dseg; + u16 flags; + u16 cseg_len; + u16 cseg_16_len; + u16 dseg_len; }; /* Results of APM Installation Check */