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

a02b1193 · Joerg Roedel · d3ad9373 · aeb583d0 · a02b1193
Commit a02b1193 authored Jan 22, 2010 by Joerg Roedel
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/dma-debug.c lib/dma-debug.c +1 -1

No files found.
--- 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,
 };