diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:15 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:15 -0500 |
| commit | b00615d163cd24fa98d155acfc1f9d81d6fe1103 (patch) | |
| tree | dde815788aaea3e336aaaf24763311ce63a22e1b /arch/x86/include/asm/amd_iommu.h | |
| parent | 75639e7ee1401b3876c7a00ffe96ea8027668690 (diff) | |
| parent | d6797322231af98b9bb4afb175dd614cf511e5f7 (diff) | |
Merge branch 'topic/pcm-dma-fix' into topic/core-change
Diffstat (limited to 'arch/x86/include/asm/amd_iommu.h')
| -rw-r--r-- | arch/x86/include/asm/amd_iommu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/amd_iommu.h b/arch/x86/include/asm/amd_iommu.h index ac95995b7bad..4b180897e6b5 100644 --- a/arch/x86/include/asm/amd_iommu.h +++ b/arch/x86/include/asm/amd_iommu.h | |||
| @@ -31,6 +31,7 @@ extern irqreturn_t amd_iommu_int_handler(int irq, void *data); | |||
| 31 | extern void amd_iommu_flush_all_domains(void); | 31 | extern void amd_iommu_flush_all_domains(void); |
| 32 | extern void amd_iommu_flush_all_devices(void); | 32 | extern void amd_iommu_flush_all_devices(void); |
| 33 | extern void amd_iommu_shutdown(void); | 33 | extern void amd_iommu_shutdown(void); |
| 34 | extern void amd_iommu_apply_erratum_63(u16 devid); | ||
| 34 | #else | 35 | #else |
| 35 | static inline int amd_iommu_init(void) { return -ENODEV; } | 36 | static inline int amd_iommu_init(void) { return -ENODEV; } |
| 36 | static inline void amd_iommu_detect(void) { } | 37 | static inline void amd_iommu_detect(void) { } |