diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
| commit | aaf015890754d58dcb71a4aa44ed246bb082bcf6 (patch) | |
| tree | 17b51ff707fd1b3efec3a3ab872f0d7a7416aca5 /drivers/iommu/intel-iommu.c | |
| parent | 9c32c63bb70b2fafc3b18bee29959c3bf245ceba (diff) | |
| parent | 8def5f51b012efb00e77ba2d04696cc0aadd0609 (diff) | |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
Diffstat (limited to 'drivers/iommu/intel-iommu.c')
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index c0c7820d4c46..a004c3945c67 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c | |||
| @@ -3524,7 +3524,7 @@ found: | |||
| 3524 | return 0; | 3524 | return 0; |
| 3525 | } | 3525 | } |
| 3526 | 3526 | ||
| 3527 | int dmar_parse_rmrr_atsr_dev(void) | 3527 | int __init dmar_parse_rmrr_atsr_dev(void) |
| 3528 | { | 3528 | { |
| 3529 | struct dmar_rmrr_unit *rmrr, *rmrr_n; | 3529 | struct dmar_rmrr_unit *rmrr, *rmrr_n; |
| 3530 | struct dmar_atsr_unit *atsr, *atsr_n; | 3530 | struct dmar_atsr_unit *atsr, *atsr_n; |