]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 78a2cbd) | patch
iommu: remove stale declaration left over by a merge conflict
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Nov 2024 02:45:33 +0000 (18:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Nov 2024 02:45:33 +0000 (18:45 -0800)
commit222974c6ec9d901f7ad13bbe6e505ec1f1d822d4
tree41a05482263e3b0b09d880ea677c068444b172fatree
parent78a2cbd809ef834b680f2825d3e4c16ec66f8ffacommit | diff
iommu: remove stale declaration left over by a merge conflict

The merge commit ae3325f752ef ("Merge branches 'arm/smmu', 'mediatek',
's390', 'ti/omap', 'riscv' and 'core' into next") left a stale
declaration of 'iommu_present()' even though the 'core' branch that was
merged had removed the function (and the declaration).

Remove it for real.

Reported-by: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/iommu.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.