diff options
author | Dave Airlie <airlied@linux.ie> | 2004-08-24 11:15:53 +0000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2004-08-24 11:15:53 +0000 |
commit | d4dbf457813e97531ded3bf24f3b6ad421189c69 (patch) | |
tree | 8e47c1dd5d7cf9c8c4bce4a7e34531fc9a8eae75 /linux/i830.h | |
parent | eac498baeaf9b57b448065b0fb9f4eeadbb9aa6b (diff) |
Merged drmfntbl-0-0-2drmfntbl-0-0-2-20040824-merge
Diffstat (limited to 'linux/i830.h')
-rw-r--r-- | linux/i830.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/linux/i830.h b/linux/i830.h index 7e176f2c..eb2d9449 100644 --- a/linux/i830.h +++ b/linux/i830.h @@ -36,10 +36,6 @@ /* General customization: */ -#define __HAVE_AGP 1 -#define __MUST_HAVE_AGP 1 -#define __HAVE_MTRR 1 -#define __HAVE_CTX_BITMAP 1 #define DRIVER_AUTHOR "VA Linux Systems Inc." @@ -83,12 +79,6 @@ #define __HAVE_COUNTER8 _DRM_STAT_SECONDARY #define __HAVE_COUNTER9 _DRM_STAT_DMA -/* DMA customization: - */ -#define __HAVE_DMA 1 -#define __HAVE_DMA_QUEUE 1 -#define __HAVE_DMA_RECLAIM 1 - /* Driver will work either way: IRQ's save cpu time when waiting for * the card, but are subject to subtle interactions between bios, * hardware and the driver. @@ -96,11 +86,4 @@ /* XXX: Add vblank support? */ #define USE_IRQS 0 -#if USE_IRQS -#define __HAVE_IRQ 1 -#define __HAVE_SHARED_IRQ 1 -#else -#define __HAVE_IRQ 0 -#endif - #endif |