diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-07-09 16:20:31 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-07-09 16:20:31 +1000 |
| commit | e6a16710033d189aa5d6b2e3b4a75f2dd9d05a5d (patch) | |
| tree | a7f826331d620442aed6dc4eb07514ecc82553d1 /src/nv_type.h | |
| parent | 3f4aa20f4f4dd3c1a306e87aafe030bb3c926688 (diff) | |
| parent | e182cff4f72f2e8403d94898c55cbca6e6349ba0 (diff) | |
| download | xorg-driver-xf86-video-nouveau-e6a16710033d189aa5d6b2e3b4a75f2dd9d05a5d.tar.gz | |
Merge branch 'nv50-branch' into upstream-nv50-branch
Conflicts:
src/Makefile.am
src/nv_hw.c
src/nv_proto.h
Diffstat (limited to 'src/nv_type.h')
| -rw-r--r-- | src/nv_type.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/nv_type.h b/src/nv_type.h index 9515bb0..73a326f 100644 --- a/src/nv_type.h +++ b/src/nv_type.h @@ -295,10 +295,6 @@ typedef struct _NVRec { CARD32 dmaMax; CARD32 *dmaBase; - Bool use3D; - void (*Reset3D)(NVPtr pNv); - void (*InitEXA3D)(NVPtr pNv); - CARD32 currentRop; int M2MFDirection; |