diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
| commit | 198030782cedf25391e67e7c88b04f87a5eb6563 (patch) | |
| tree | 5b7368c6bf052bcb4bb273497a57900720d36f51 /include/linux/phantom.h | |
| parent | 4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e (diff) | |
| parent | 92181f190b649f7ef2b79cbf5c00f26ccc66da2a (diff) | |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'include/linux/phantom.h')
| -rw-r--r-- | include/linux/phantom.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/phantom.h b/include/linux/phantom.h index 02268c54c250..94dd6645c60a 100644 --- a/include/linux/phantom.h +++ b/include/linux/phantom.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #ifndef __PHANTOM_H | 10 | #ifndef __PHANTOM_H |
| 11 | #define __PHANTOM_H | 11 | #define __PHANTOM_H |
| 12 | 12 | ||
| 13 | #include <asm/types.h> | 13 | #include <linux/types.h> |
| 14 | 14 | ||
| 15 | /* PHN_(G/S)ET_REG param */ | 15 | /* PHN_(G/S)ET_REG param */ |
| 16 | struct phm_reg { | 16 | struct phm_reg { |