kernel.h: Retain constant expression output for max()/min()

[linux-2.6-microblaze.git] / drivers / gpu / drm / drm_color_mgmt.c

diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c
index 4ff0646..b97e2de 100644 (file)
--- a/drivers/gpu/drm/drm_color_mgmt.c
+++ b/drivers/gpu/drm/drm_color_mgmt.c
@@ -417,8 +417,8 @@ int drm_plane_create_color_properties(struct drm_plane *plane,
 {
        struct drm_device *dev = plane->dev;
        struct drm_property *prop;
-       struct drm_prop_enum_list enum_list[max(DRM_COLOR_ENCODING_MAX,
-                                               DRM_COLOR_RANGE_MAX)];
+       struct drm_prop_enum_list enum_list[max_t(int, DRM_COLOR_ENCODING_MAX,
+                                                      DRM_COLOR_RANGE_MAX)];
        int i, len;
 
        if (WARN_ON(supported_encodings == 0 ||