diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-12 06:48:14 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-12 06:48:14 +0300 |
| commit | 855e7e7174bade3f2b63077a81eea5aab525dbf6 (patch) | |
| tree | 3423eb92315865d76cb8d488513bfef6ab9251d0 /drivers/iommu/amd_iommu.c | |
| parent | e09dcd2e7913aa50b5cb4836bc1e990e429e4aff (diff) | |
| parent | 59d53737a8640482995fea13c6e2c0fd016115d6 (diff) | |
| download | linux-855e7e7174bade3f2b63077a81eea5aab525dbf6.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
I pushed a version of the crypto iov_iter bug fix that
Al Viro wrote, but Linus put in a different copy of the
same fix into his tree.
I then reverted my commit in net-next, and that's why we have a merge
when pulling in Linus's tree.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/iommu/amd_iommu.c')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 98024856df07..59de6364a910 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -4284,7 +4284,6 @@ static int alloc_hpet_msi(unsigned int irq, unsigned int id) } struct irq_remap_ops amd_iommu_irq_ops = { - .supported = amd_iommu_supported, .prepare = amd_iommu_prepare, .enable = amd_iommu_enable, .disable = amd_iommu_disable, |