vserver 1.9.3

[linux-2.6.git] / drivers / char / drm / r128.h

diff --git a/drivers/char/drm/r128.h b/drivers/char/drm/r128.h
index 9dfe189..1df7042 100644 (file)
--- a/drivers/char/drm/r128.h
+++ b/drivers/char/drm/r128.h
@@ -36,13 +36,6 @@
 
 /* General customization:
  */
-#define __HAVE_AGP             1
-#define __MUST_HAVE_AGP                0
-#define __HAVE_MTRR            1
-#define __HAVE_CTX_BITMAP      1
-#define __HAVE_SG              1
-#define __HAVE_PCI_DMA         1
-
 #define DRIVER_AUTHOR          "Gareth Hughes, VA Linux Systems Inc."
 
 #define DRIVER_NAME            "r128"
@@ -79,42 +72,4 @@
    [DRM_IOCTL_NR(DRM_IOCTL_R128_INDIRECT)]   = { r128_cce_indirect, 1, 1 }, \
    [DRM_IOCTL_NR(DRM_IOCTL_R128_GETPARAM)]   = { r128_getparam, 1, 0 },
 
-/* Driver customization:
- */
-#define DRIVER_PRERELEASE() do {                                       \
-       if ( dev->dev_private ) {                                       \
-               drm_r128_private_t *dev_priv = dev->dev_private;        \
-               if ( dev_priv->page_flipping ) {                        \
-                       r128_do_cleanup_pageflip( dev );                \
-               }                                                       \
-       }                                                               \
-} while (0)
-
-#define DRIVER_PRETAKEDOWN() do {                                      \
-       r128_do_cleanup_cce( dev );                                     \
-} while (0)
-
-/* DMA customization:
- */
-#define __HAVE_DMA             1
-#define __HAVE_IRQ             1
-#define __HAVE_VBL_IRQ         1
-#define __HAVE_SHARED_IRQ       1
-
-#if 0
-/* GH: Remove this for now... */
-#define __HAVE_DMA_QUIESCENT   1
-#define DRIVER_DMA_QUIESCENT() do {                                    \
-       drm_r128_private_t *dev_priv = dev->dev_private;                \
-       return r128_do_cce_idle( dev_priv );                            \
-} while (0)
-#endif
-
-/* Buffer customization:
- */
-#define DRIVER_BUF_PRIV_T      drm_r128_buf_priv_t
-
-#define DRIVER_AGP_BUFFERS_MAP( dev )                                  \
-       ((drm_r128_private_t *)((dev)->dev_private))->buffers
-
 #endif