diff options
| author | Adam Jackson <ajax@redhat.com> | 2007-12-17 16:20:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 19:28:16 -0800 |
| commit | 8d936626dd00bd47cf574add458fea8a23b79611 (patch) | |
| tree | 4d2f13a1629b51edc6c75a1ee537b5467491cb5e /include/linux/apm_bios.h | |
| parent | a33234735b2bcfb23cf1facb1f0d8656b8edab8f (diff) | |
| download | talos-obmc-linux-8d936626dd00bd47cf574add458fea8a23b79611.tar.gz talos-obmc-linux-8d936626dd00bd47cf574add458fea8a23b79611.zip | |
apm_event{,info}_t are userspace types
These types define the size of data read from /dev/apm_bios. They should
not be hidden behind #ifdef __KERNEL__.
This is killing my xserver compile, apm_event_t is used in the xserver
source.
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/apm_bios.h')
| -rw-r--r-- | include/linux/apm_bios.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/apm_bios.h b/include/linux/apm_bios.h index 9754baa14921..01a6244c9bc9 100644 --- a/include/linux/apm_bios.h +++ b/include/linux/apm_bios.h @@ -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; @@ -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) |
