diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-03 11:07:29 -0400 |
| commit | efc33ce197e4b6aaddf1eb2ba6293f51daf3c283 (patch) | |
| tree | 9eaceed3c855d5cbc91c2fc247bdcceafbf28cdf /drivers/iommu/dmar.c | |
| parent | 993884f6a26c6547fa3875f9d3fabdc4250d8da6 (diff) | |
| parent | 690a863ff03d9a29ace2b752b8f802fba78a842f (diff) | |
Merge branch 'for-linus' into for-next
Back-merge for cleaning up usb-audio code the recent commit modified,
and further UAC2 autoclock patches.
Diffstat (limited to 'drivers/iommu/dmar.c')
| -rw-r--r-- | drivers/iommu/dmar.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index dc7e478b7e5f..e5cdaf87822c 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c | |||
| @@ -1083,6 +1083,7 @@ static const char *dma_remap_fault_reasons[] = | |||
| 1083 | "non-zero reserved fields in RTP", | 1083 | "non-zero reserved fields in RTP", |
| 1084 | "non-zero reserved fields in CTP", | 1084 | "non-zero reserved fields in CTP", |
| 1085 | "non-zero reserved fields in PTE", | 1085 | "non-zero reserved fields in PTE", |
| 1086 | "PCE for translation request specifies blocking", | ||
| 1086 | }; | 1087 | }; |
| 1087 | 1088 | ||
| 1088 | static const char *irq_remap_fault_reasons[] = | 1089 | static const char *irq_remap_fault_reasons[] = |