diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
| commit | 0464ac9ebd90cfd5792d3c1158af848281b7eb09 (patch) | |
| tree | ab4419845b9e7ae3417741f34cfab6acd00754aa /include/linux/edd.h | |
| parent | 0973a06cde8cc1522fbcf2baacb926f1ee3f4c79 (diff) | |
| parent | 9be260a646bf76fa418ee519afa10196b3164681 (diff) | |
Merge branch 'linus' into x86/mm
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'include/linux/edd.h')
| -rw-r--r-- | include/linux/edd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/edd.h b/include/linux/edd.h index 5d747c5cd0fe..4cbd0fe9df08 100644 --- a/include/linux/edd.h +++ b/include/linux/edd.h | |||
| @@ -30,6 +30,8 @@ | |||
| 30 | #ifndef _LINUX_EDD_H | 30 | #ifndef _LINUX_EDD_H |
| 31 | #define _LINUX_EDD_H | 31 | #define _LINUX_EDD_H |
| 32 | 32 | ||
| 33 | #include <linux/types.h> | ||
| 34 | |||
| 33 | #define EDDNR 0x1e9 /* addr of number of edd_info structs at EDDBUF | 35 | #define EDDNR 0x1e9 /* addr of number of edd_info structs at EDDBUF |
| 34 | in boot_params - treat this as 1 byte */ | 36 | in boot_params - treat this as 1 byte */ |
| 35 | #define EDDBUF 0xd00 /* addr of edd_info structs in boot_params */ | 37 | #define EDDBUF 0xd00 /* addr of edd_info structs in boot_params */ |