diff options
| author |   Greg KH <gregkh@suse.de> | 2005-09-12 12:10:59 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 12:10:59 -0700 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /drivers/video/pxafb.h | |
| parent | [PATCH] I2C: i2c-nforce2: drop unused define (diff) | |
| parent | [PATCH] x86-64: clean up local_add/sub arguments (diff) | |
| download | linux-dev-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.tar.xz linux-dev-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.zip | |
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/video/pxafb.h')
| -rw-r--r-- | drivers/video/pxafb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/pxafb.h b/drivers/video/pxafb.h index de15fec5f82f..22c00be786a8 100644 --- a/drivers/video/pxafb.h +++ b/drivers/video/pxafb.h @@ -83,6 +83,8 @@ struct pxafb_info { u_int reg_lccr2; u_int reg_lccr3; + unsigned long hsync_time; + volatile u_char state; volatile u_char task_state; struct semaphore ctrlr_sem; |