diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-08-08 12:28:20 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-08-08 12:28:20 +1000 |
| commit | 096a2a556016c609ad0200ea4592ceb42a347a1d (patch) | |
| tree | ecdac17a96f9dcdae0d05d241c1865bf5a14b975 /src/nv_type.h | |
| parent | 94da101b675916aeaf751df28bea4af67b2bb175 (diff) | |
| parent | 9cb4c95a4fbf38fcb8249e765ff71b2e24912244 (diff) | |
| download | xorg-driver-xf86-video-nouveau-096a2a556016c609ad0200ea4592ceb42a347a1d.tar.gz | |
Merge branch 'upstream-master' into upstream-randr-1.2randr-1.2
Conflicts:
src/nv_dma.c
src/nv_dma.h
src/nv_exa.c
Diffstat (limited to 'src/nv_type.h')
| -rw-r--r-- | src/nv_type.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nv_type.h b/src/nv_type.h index 302c6c0..01f76cc 100644 --- a/src/nv_type.h +++ b/src/nv_type.h @@ -284,13 +284,12 @@ typedef struct _NVRec { int PanelTweak; Bool LVDS; - int IRQ; Bool LockedUp; volatile void * NotifierBlock; - struct drm_nouveau_notifier_alloc *Notifier0; + struct drm_nouveau_notifierobj_alloc *Notifier0; - struct drm_nouveau_fifo_alloc fifo; + struct drm_nouveau_channel_alloc fifo; CARD32 dmaPut; CARD32 dmaCurrent; CARD32 dmaFree; |