Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 7d2f0b33e5a82937d2fb615fe5bbbb0de3884777..ba8b67039d13eac2a81835a92d3241375fb43d3d 100644 (file)
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -587,7 +587,7 @@ out_unlock:
        return count;
 }
 
-const struct file_operations filter_fops = {
+static const struct file_operations filter_fops = {
        .read  = filter_read,
        .write = filter_write,
 };