diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-05-07 17:01:08 -0700 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-08 09:02:09 +0200 |
| commit | b0225d5a4857282af7e81a80e1c35e14c87bfb0f (patch) | |
| tree | 5f1cd8c9925ef08fbb6259548837d867010791b3 /patches/backport-adjustments | |
| parent | 68ee70bbfaf818704e79790912d2f062a83b0651 (diff) | |
backports: refresh patches for next-20130405
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/backport-adjustments')
| -rw-r--r-- | patches/backport-adjustments/dma-buf.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/backport-adjustments/dma-buf.patch b/patches/backport-adjustments/dma-buf.patch index 789a1083..a0f33936 100644 --- a/patches/backport-adjustments/dma-buf.patch +++ b/patches/backport-adjustments/dma-buf.patch @@ -11,7 +11,7 @@ static inline int is_dma_buf_file(struct file *); -@@ -126,6 +129,27 @@ struct dma_buf *dma_buf_export(void *pri +@@ -126,6 +130,27 @@ struct dma_buf *dma_buf_export(void *pri } EXPORT_SYMBOL_GPL(dma_buf_export); @@ -39,7 +39,7 @@ /** * dma_buf_fd - returns a file descriptor for the given dma_buf -@@ -141,9 +165,10 @@ int dma_buf_fd(struct dma_buf *dmabuf, i +@@ -141,9 +166,10 @@ int dma_buf_fd(struct dma_buf *dmabuf, i if (!dmabuf || !dmabuf->file) return -EINVAL; |