projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
[cascardo/linux.git]
/
include
/
linux
/
apm_bios.h
diff --git
a/include/linux/apm_bios.h
b/include/linux/apm_bios.h
index
5f921c8
..
01a6244
100644
(file)
--- a/
include/linux/apm_bios.h
+++ b/
include/linux/apm_bios.h
@@
-16,29
+16,29
@@
* General Public License for more details.
*/
* General Public License for more details.
*/
+#include <linux/types.h>
+
typedef unsigned short apm_event_t;
typedef unsigned short apm_eventinfo_t;
typedef unsigned short apm_event_t;
typedef unsigned short apm_eventinfo_t;
-#ifdef __KERNEL__
+struct apm_bios_info {
+ __u16 version;
+ __u16 cseg;
+ __u32 offset;
+ __u16 cseg_16;
+ __u16 dseg;
+ __u16 flags;
+ __u16 cseg_len;
+ __u16 cseg_16_len;
+ __u16 dseg_len;
+};
-#i
nclude <linux/types.h>
+#i
fdef __KERNEL__
#define APM_CS (GDT_ENTRY_APMBIOS_BASE * 8)
#define APM_CS_16 (APM_CS + 8)
#define APM_DS (APM_CS_16 + 8)
#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 {
- 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 */
#define APM_16_BIT_SUPPORT 0x0001
#define APM_32_BIT_SUPPORT 0x0002
/* Results of APM Installation Check */
#define APM_16_BIT_SUPPORT 0x0001
#define APM_32_BIT_SUPPORT 0x0002