OSDN Git Service

Revert "staging: media: atomisp: fill properly hmm_bo_type_strings when ION is disabled"
authorJérémy Lefaure <jeremy.lefaure@lse.epita.fr>
Fri, 17 Mar 2017 02:13:51 +0000 (22:13 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Mar 2017 06:14:30 +0000 (15:14 +0900)
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>
drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c

index e78f02f..a362b49 100644 (file)
@@ -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,