Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 74983
b: refs/heads/master
c: 8d93662
h: refs/heads/master
i:
  74981: dcf4e87
  74979: 424a746
  74975: 67a2941
v: v3
  • Loading branch information
Adam Jackson authored and Linus Torvalds committed Dec 18, 2007
1 parent 7b65efe commit f2ac266
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a33234735b2bcfb23cf1facb1f0d8656b8edab8f
refs/heads/master: 8d936626dd00bd47cf574add458fea8a23b79611
6 changes: 3 additions & 3 deletions trunk/include/linux/apm_bios.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@

#include <linux/types.h>

typedef unsigned short apm_event_t;
typedef unsigned short apm_eventinfo_t;

struct apm_bios_info {
__u16 version;
__u16 cseg;
Expand All @@ -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)
Expand Down

0 comments on commit f2ac266

Please sign in to comment.