[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Kludge around m...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/82157555a2d0
branches:  riastradh-drm2
changeset: 788435:82157555a2d0
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:47:07 2013 +0000

description:
Kludge around max as a local variable in intel_panel.c.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_panel.c |  8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diffs (25 lines):

diff -r a045ecbddcf2 -r 82157555a2d0 sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c Wed Jul 24 03:46:52 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c Wed Jul 24 03:47:07 2013 +0000
@@ -166,6 +166,10 @@
        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 @@
        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;