diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-12-12 18:52:34 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-12-12 18:52:34 -0800 |
| commit | af3c969e503a355a0ba4f9c6b98a4c0dd20705ab (patch) | |
| tree | ef0a05b11a83f82df084c2f0f3090e3b19d015e4 /drivers/staging/android/ion/ion_chunk_heap.c | |
| parent | 5ef3c884d2291f784bc7c08f48112b04ffbb2f8d (diff) | |
| parent | 8f1c42284159ebd6851e1e75507f2ad6fba87d0f (diff) | |
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
Diffstat (limited to 'drivers/staging/android/ion/ion_chunk_heap.c')
| -rw-r--r-- | drivers/staging/android/ion/ion_chunk_heap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c index 9c0eb5431f8..ca20d627960 100644 --- a/drivers/staging/android/ion/ion_chunk_heap.c +++ b/drivers/staging/android/ion/ion_chunk_heap.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. * */ -//#include <linux/spinlock.h> #include <linux/dma-mapping.h> #include <linux/err.h> #include <linux/genalloc.h> |