diff options
| author | Jérémy Lefaure <jeremy.lefaure@lse.epita.fr> | 2017-03-16 22:13:51 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-17 15:14:30 +0900 |
| commit | 9ca98bd077480473d075a2c50647da42d5ad6b50 (patch) | |
| tree | 58246e745da075a22e7b23f0eb3be85c61c91e47 /drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c | |
| parent | 7bc49cb9b9b8bad32536c4b6d1aff1824c1adc6c (diff) | |
Revert "staging: media: atomisp: fill properly hmm_bo_type_strings when ION is disabled"
This reverts commit fde469701c7efabebf885e785edf367bfb1a8f3f.
Adding a preprocessor condition is not the best solution to fix this
issue. Let's revert this commit before fixing this problem in a more
appropriate way.
Signed-off-by: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c index e78f02f74d0f..a362b492ec8e 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c @@ -49,9 +49,7 @@ const char *hmm_bo_type_strings[HMM_BO_LAST] = { "p", /* private */ "s", /* shared */ "u", /* user */ -#ifdef CONFIG_ION "i", /* ion */ -#endif }; static ssize_t bo_show(struct device *dev, struct device_attribute *attr, |