diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 00:49:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 00:49:07 -0500 |
| commit | d8762748cae4f85b3201c0304969d993b42d5258 (patch) | |
| tree | 559819d9b17e5ee305d705cf9f31ac5de2aab54a /drivers/char/drm/via_drm.h | |
| parent | ce4633704038f9bf39f20c10691747d6fc127bf4 (diff) | |
| parent | a4e62fa031a9681477207b08391c3a5c5c831ce7 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Manual fixups for some clashes due to re-indenting.
Diffstat (limited to 'drivers/char/drm/via_drm.h')
| -rw-r--r-- | drivers/char/drm/via_drm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/via_drm.h b/drivers/char/drm/via_drm.h index be346bb0a26a..ebde9206115e 100644 --- a/drivers/char/drm/via_drm.h +++ b/drivers/char/drm/via_drm.h | |||
| @@ -149,7 +149,7 @@ typedef struct _drm_via_dma_init { | |||
| 149 | enum { | 149 | enum { |
| 150 | VIA_INIT_DMA = 0x01, | 150 | VIA_INIT_DMA = 0x01, |
| 151 | VIA_CLEANUP_DMA = 0x02, | 151 | VIA_CLEANUP_DMA = 0x02, |
| 152 | VIA_DMA_INITIALIZED = 0x03 | 152 | VIA_DMA_INITIALIZED = 0x03 |
| 153 | } func; | 153 | } func; |
| 154 | 154 | ||
| 155 | unsigned long offset; | 155 | unsigned long offset; |
| @@ -212,7 +212,7 @@ typedef enum { | |||
| 212 | 212 | ||
| 213 | #define VIA_IRQ_FLAGS_MASK 0xF0000000 | 213 | #define VIA_IRQ_FLAGS_MASK 0xF0000000 |
| 214 | 214 | ||
| 215 | struct drm_via_wait_irq_request{ | 215 | struct drm_via_wait_irq_request { |
| 216 | unsigned irq; | 216 | unsigned irq; |
| 217 | via_irq_seq_type_t type; | 217 | via_irq_seq_type_t type; |
| 218 | uint32_t sequence; | 218 | uint32_t sequence; |