diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-13 18:50:12 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-13 18:50:12 +0000 |
| commit | 679160a872dfe88bf34e50f1939e190ba59e534e (patch) | |
| tree | fe342d02e224d006a23745a657148ce62b54fee4 /drivers/staging/android/ion/ion.h | |
| parent | eed4bafd63b5584adb832a582a931ecba41dec55 (diff) | |
| parent | 8f1c42284159ebd6851e1e75507f2ad6fba87d0f (diff) | |
Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into lsk-v3.10-aospv3.10/topic/aosp
Diffstat (limited to 'drivers/staging/android/ion/ion.h')
| -rw-r--r-- | drivers/staging/android/ion/ion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/ion/ion.h b/drivers/staging/android/ion/ion.h index 962e1c58d36..dcd2a0cdb19 100644 --- a/drivers/staging/android/ion/ion.h +++ b/drivers/staging/android/ion/ion.h @@ -38,7 +38,7 @@ struct ion_buffer; * struct ion_platform_heap - defines a heap in the given platform * @type: type of the heap from ion_heap_type enum * @id: unique identifier for heap. When allocating higher numbers - * will be allocated from first. At allocation these are passed + * will be allocated from first. At allocation these are passed * as a bit mask and therefore can not exceed ION_NUM_HEAP_IDS. * @name: used for debug purposes * @base: base address of heap in physical memory if applicable |