From f2ac26647ee999116125b19e25d0674a2c904dab Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 17 Dec 2007 16:20:04 -0800 Subject: [PATCH] --- yaml --- r: 74983 b: refs/heads/master c: 8d936626dd00bd47cf574add458fea8a23b79611 h: refs/heads/master i: 74981: dcf4e870e2b529f5a436799b370a93fba395c843 74979: 424a7468dae96237b5427ee7c507a1c018dbb17c 74975: 67a2941d756ed8965685c266a7ede8b6f22c5206 v: v3 --- [refs] | 2 +- trunk/include/linux/apm_bios.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7b73aa16772a..15786a9b1b8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a33234735b2bcfb23cf1facb1f0d8656b8edab8f +refs/heads/master: 8d936626dd00bd47cf574add458fea8a23b79611 diff --git a/trunk/include/linux/apm_bios.h b/trunk/include/linux/apm_bios.h index 9754baa14921..01a6244c9bc9 100644 --- a/trunk/include/linux/apm_bios.h +++ b/trunk/include/linux/apm_bios.h @@ -18,6 +18,9 @@ #include +typedef unsigned short apm_event_t; +typedef unsigned short apm_eventinfo_t; + struct apm_bios_info { __u16 version; __u16 cseg; @@ -32,9 +35,6 @@ struct apm_bios_info { #ifdef __KERNEL__ -typedef unsigned short apm_event_t; -typedef unsigned short apm_eventinfo_t; - #define APM_CS (GDT_ENTRY_APMBIOS_BASE * 8) #define APM_CS_16 (APM_CS + 8) #define APM_DS (APM_CS_16 + 8)