diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/x86/include/asm/calgary.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/x86/include/asm/calgary.h')
| -rw-r--r-- | arch/x86/include/asm/calgary.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/calgary.h b/arch/x86/include/asm/calgary.h index b03bedb62aa..0918654305a 100644 --- a/arch/x86/include/asm/calgary.h +++ b/arch/x86/include/asm/calgary.h | |||
| @@ -62,10 +62,8 @@ struct cal_chipset_ops { | |||
| 62 | extern int use_calgary; | 62 | extern int use_calgary; |
| 63 | 63 | ||
| 64 | #ifdef CONFIG_CALGARY_IOMMU | 64 | #ifdef CONFIG_CALGARY_IOMMU |
| 65 | extern int calgary_iommu_init(void); | ||
| 66 | extern void detect_calgary(void); | 65 | extern void detect_calgary(void); |
| 67 | #else | 66 | #else |
| 68 | static inline int calgary_iommu_init(void) { return 1; } | ||
| 69 | static inline void detect_calgary(void) { return; } | 67 | static inline void detect_calgary(void) { return; } |
| 70 | #endif | 68 | #endif |
| 71 | 69 | ||