Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:47:07 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: intel_panel.c
Log Message:
Kludge around max as a local variable in intel_panel.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.1.1.1.2.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.1.1.1.2.4
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.1.1.1.2.3 Wed Jul 24 03:46:52 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c Wed Jul 24 03:47:07 2013
@@ -166,6 +166,10 @@ static u32 i915_read_blc_pwm_ctl(struct
return val;
}
+#ifdef __NetBSD__ /* XXX max kludge */
+# define max max_hack
+#endif
+
static u32 _intel_panel_get_max_backlight(struct drm_device *dev)
{
u32 max;
@@ -284,6 +288,10 @@ static void intel_panel_actually_set_bac
I915_WRITE(BLC_PWM_CTL, tmp | level);
}
+#ifdef __NetBSD__ /* XXX max hack */
+# undef max
+#endif
+
void intel_panel_set_backlight(struct drm_device *dev, u32 level)
{
struct drm_i915_private *dev_priv = dev->dev_private;
