[src/trunk]: src/sys/external/bsd/drm/dist/shared-core Rename enum pipe to en...

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

details:   https://anonhg.NetBSD.org/src/rev/134b2a7cdd30
branches:  trunk
changeset: 802202:134b2a7cdd30
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Sep 05 09:40:44 2014 +0000

description:
Rename enum pipe to enum pipe so it won't conflcit with struct pipe.

diffstat:

 sys/external/bsd/drm/dist/shared-core/i915_drv.h     |  2 +-
 sys/external/bsd/drm/dist/shared-core/i915_suspend.c |  6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 558b96d59071 -r 134b2a7cdd30 sys/external/bsd/drm/dist/shared-core/i915_drv.h
--- a/sys/external/bsd/drm/dist/shared-core/i915_drv.h  Fri Sep 05 09:27:24 2014 +0000
+++ b/sys/external/bsd/drm/dist/shared-core/i915_drv.h  Fri Sep 05 09:40:44 2014 +0000
@@ -41,7 +41,7 @@
 #define DRIVER_DESC            "Intel Graphics"
 #define DRIVER_DATE            "20080730"
 
-enum pipe {
+enum pipex {
        PIPE_A = 0,
        PIPE_B,
 };
diff -r 558b96d59071 -r 134b2a7cdd30 sys/external/bsd/drm/dist/shared-core/i915_suspend.c
--- a/sys/external/bsd/drm/dist/shared-core/i915_suspend.c      Fri Sep 05 09:27:24 2014 +0000
+++ b/sys/external/bsd/drm/dist/shared-core/i915_suspend.c      Fri Sep 05 09:40:44 2014 +0000
@@ -32,7 +32,7 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 
-static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
+static bool i915_pipe_enabled(struct drm_device *dev, enum pipex pipe)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
 
@@ -42,7 +42,7 @@
                return (I915_READ(DPLL_B) & DPLL_VCO_ENABLE);
 }
 
-static void i915_save_palette(struct drm_device *dev, enum pipe pipe)
+static void i915_save_palette(struct drm_device *dev, enum pipex pipe)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long reg = (pipe == PIPE_A ? PALETTE_A : PALETTE_B);
@@ -61,7 +61,7 @@
                array[i] = I915_READ(reg + (i << 2));
 }
 
-static void i915_restore_palette(struct drm_device *dev, enum pipe pipe)
+static void i915_restore_palette(struct drm_device *dev, enum pipex pipe)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long reg = (pipe == PIPE_A ? PALETTE_A : PALETTE_B);