diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-16 04:09:10 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-16 04:09:10 -0500 |
| commit | af2519fb2298cdf7540082c36f4d8c66bbff103f (patch) | |
| tree | 1d290d28d42d42f9e693457762c4008988628060 /include/linux/phantom.h | |
| parent | 961d7d0ee5150e0197cc81c2a8884ecb230276e2 (diff) | |
| parent | 7cb36b6ccdca03bd87e8faca7fd920643dd1aec7 (diff) | |
Merge branch 'linus' into core/iommu
Conflicts:
arch/ia64/include/asm/dma-mapping.h
arch/ia64/include/asm/machvec.h
arch/ia64/include/asm/machvec_sn2.h
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 { |