diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /drivers/pci/intel-iommu.c | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'drivers/pci/intel-iommu.c')
| -rw-r--r-- | drivers/pci/intel-iommu.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index a563fbe559d0..cd389162735f 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c | |||
| @@ -1972,15 +1972,6 @@ static int __init init_dmars(void) | |||
| 1972 | } | 1972 | } |
| 1973 | } | 1973 | } |
| 1974 | 1974 | ||
| 1975 | #ifdef CONFIG_INTR_REMAP | ||
| 1976 | if (!intr_remapping_enabled) { | ||
| 1977 | ret = enable_intr_remapping(0); | ||
| 1978 | if (ret) | ||
| 1979 | printk(KERN_ERR | ||
| 1980 | "IOMMU: enable interrupt remapping failed\n"); | ||
| 1981 | } | ||
| 1982 | #endif | ||
| 1983 | |||
| 1984 | /* | 1975 | /* |
| 1985 | * For each rmrr | 1976 | * For each rmrr |
| 1986 | * for each dev attached to rmrr | 1977 | * for each dev attached to rmrr |