From: Jérémy Lefaure Date: Fri, 17 Mar 2017 02:13:51 +0000 (-0400) Subject: Revert "staging: media: atomisp: fill properly hmm_bo_type_strings when ION is disabled" X-Git-Tag: v4.12-rc1~84^2~474 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9ca98bd077480473d075a2c50647da42d5ad6b50;p=karo-tx-linux.git 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 Signed-off-by: Greg Kroah-Hartman --- 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,