diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-01-27 05:04:40 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-01-27 05:04:40 -0500 |
| commit | e0b5f80dd4226a920257c91a3b9070e81149060b (patch) | |
| tree | 34ceb6fbebb7ba3cda95dc6ca623084daf141b51 /arch/x86/include/asm | |
| parent | b7a0afb0b4649d9b43488d5f5b1660bc9cffcff6 (diff) | |
| parent | a02b11937a6e1079fdf386833129cd86a3576196 (diff) | |
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/amd_iommu_proto.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/amd_iommu_proto.h b/arch/x86/include/asm/amd_iommu_proto.h index 4d817f9e6e77..d2544f1d705d 100644 --- a/arch/x86/include/asm/amd_iommu_proto.h +++ b/arch/x86/include/asm/amd_iommu_proto.h | |||
| @@ -31,6 +31,7 @@ extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu); | |||
| 31 | extern int amd_iommu_init_devices(void); | 31 | extern int amd_iommu_init_devices(void); |
| 32 | extern void amd_iommu_uninit_devices(void); | 32 | extern void amd_iommu_uninit_devices(void); |
| 33 | extern void amd_iommu_init_notifier(void); | 33 | extern void amd_iommu_init_notifier(void); |
| 34 | extern void amd_iommu_init_api(void); | ||
| 34 | #ifndef CONFIG_AMD_IOMMU_STATS | 35 | #ifndef CONFIG_AMD_IOMMU_STATS |
| 35 | 36 | ||
| 36 | static inline void amd_iommu_stats_init(void) { } | 37 | static inline void amd_iommu_stats_init(void) { } |