Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[mv-sheeva.git] / include / linux / apm_bios.h

diff --git a/include/linux/apm_bios.h b/include/linux/apm_bios.h
index 9754baa1492171fbd89e6512fdf3160eb1a9e279..01a6244c9bc9b52f0583449d667a1a34f2a95dd7 100644 (file)
--- 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)