[src/trunk]: src/sys/external/bsd/drm/dist/shared-core unifdef -U__linux__ -U...

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

details:   https://anonhg.NetBSD.org/src/rev/312698c99b88
branches:  trunk
changeset: 761239:312698c99b88
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Fri Jan 21 21:57:16 2011 +0000

description:
unifdef -U__linux__ -U__FreeBSD__.  No functional change intended.

diffstat:

 sys/external/bsd/drm/dist/shared-core/i915_drv.h |  17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

diffs (41 lines):

diff -r b56302bbeb4f -r 312698c99b88 sys/external/bsd/drm/dist/shared-core/i915_drv.h
--- a/sys/external/bsd/drm/dist/shared-core/i915_drv.h  Fri Jan 21 20:36:53 2011 +0000
+++ b/sys/external/bsd/drm/dist/shared-core/i915_drv.h  Fri Jan 21 21:57:16 2011 +0000
@@ -232,9 +232,6 @@
        u8 saveDACDATA[256*3]; /* 256 3-byte colors */
        u8 saveCR[37];
        struct {
-#ifdef __linux__
-               struct drm_mm gtt_space;
-#endif
                /**
                 * List of objects currently involved in rendering from the
                 * ringbuffer.
@@ -267,16 +264,6 @@
                 * outstanding.
                 */
                struct list_head request_list;
-#ifdef __linux__
-               /**
-                * We leave the user IRQ off as much as possible,
-                * but this means that requests will finish and never
-                * be retired once the system goes idle. Set a timer to
-                * fire periodically while the ring is running. When it
-                * fires, go retire requests.
-                */
-               struct delayed_work retire_work;
-#endif
                uint32_t next_gem_seqno;
 
                /**
@@ -556,10 +543,6 @@
                LOCK_TEST_WITH_RETURN(dev, file_priv);                  \
 } while (0)
 
-#if defined(__FreeBSD__)
-typedef boolean_t bool;
-#endif
-
 #define I915_READ(reg)         DRM_READ32(dev_priv->mmio_map, (reg))
 #define I915_WRITE(reg,val)    DRM_WRITE32(dev_priv->mmio_map, (reg), (val))
 #define I915_READ16(reg)       DRM_READ16(dev_priv->mmio_map, (reg))