From 9ca98bd077480473d075a2c50647da42d5ad6b50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9my=20Lefaure?= Date: Thu, 16 Mar 2017 22:13:51 -0400 Subject: [PATCH] Revert "staging: media: atomisp: fill properly hmm_bo_type_strings when ION is disabled" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 2 -- 1 file changed, 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, -- 2.45.2