diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 08:58:11 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 08:58:11 -0500 |
| commit | 249d51b53aea1b7cdb1be65a1a9a0c59d9e06f3e (patch) | |
| tree | 7fc06930e46ee13d394f5b031166c40206af3189 /include/linux/edd.h | |
| parent | 44581a28e805a31661469c4b466b9cd14b36e7b6 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into core/percpu
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
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 */ |