diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
| commit | c5111f504d2a9b0d258d7c4752b4093523315989 (patch) | |
| tree | 6a52864aff79691689aea21cb0cb928327d5de5b /drivers/video/i810/i810.h | |
| parent | 69eb66d7da7dba2696281981347698e1693c2340 (diff) | |
| parent | a488edc914aa1d766a4e2c982b5ae03d5657ec1b (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/video/i810/i810.h')
| -rw-r--r-- | drivers/video/i810/i810.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h index 6c187d5fe951..579195c2bea3 100644 --- a/drivers/video/i810/i810.h +++ b/drivers/video/i810/i810.h | |||
| @@ -280,6 +280,7 @@ struct i810fb_par { | |||
| 280 | u32 blit_bpp; | 280 | u32 blit_bpp; |
| 281 | u32 ovract; | 281 | u32 ovract; |
| 282 | u32 cur_state; | 282 | u32 cur_state; |
| 283 | u32 ddc_num; | ||
| 283 | int mtrr_reg; | 284 | int mtrr_reg; |
| 284 | u16 bltcntl; | 285 | u16 bltcntl; |
| 285 | u8 interlace; | 286 | u8 interlace; |