diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 05:02:41 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 05:02:41 -0400 |
| commit | 4d6ca227c768b50b05cf183974b40abe444e9d0c (patch) | |
| tree | bf953d8e895281053548b9967a2c4b58d641df00 /lib/dma-noop.c | |
| parent | 800f3eef8ebc1264e9c135bfa892c8ae41fa4792 (diff) | |
| parent | af22a610bc38508d5ea760507d31be6b6983dfa8 (diff) | |
Merge branch 'for-4.12/asus' into for-linus
Diffstat (limited to 'lib/dma-noop.c')
| -rw-r--r-- | lib/dma-noop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dma-noop.c b/lib/dma-noop.c index 3d766e78fbe2..de26c8b68f34 100644 --- a/lib/dma-noop.c +++ b/lib/dma-noop.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * lib/dma-noop.c | 2 | * lib/dma-noop.c |
| 3 | * | 3 | * |
| 4 | * Simple DMA noop-ops that map 1:1 with memory | 4 | * DMA operations that map to physical addresses without flushing memory. |
| 5 | */ | 5 | */ |
| 6 | #include <linux/export.h> | 6 | #include <linux/export.h> |
| 7 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
| @@ -64,7 +64,7 @@ static int dma_noop_supported(struct device *dev, u64 mask) | |||
| 64 | return 1; | 64 | return 1; |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | struct dma_map_ops dma_noop_ops = { | 67 | const struct dma_map_ops dma_noop_ops = { |
| 68 | .alloc = dma_noop_alloc, | 68 | .alloc = dma_noop_alloc, |
| 69 | .free = dma_noop_free, | 69 | .free = dma_noop_free, |
| 70 | .map_page = dma_noop_map_page, | 70 | .map_page = dma_noop_map_page, |
