diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 12:34:16 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 12:34:16 -0500 |
| commit | 4567c4a89693416ccca02d32109bce967e9c1ade (patch) | |
| tree | 9d77cf02ce269ed5fc4b6e2ebddb9ad7fd504ad1 /include/video/pxa168fb.h | |
| parent | 602fd7c36728a04e61a442c9755e7d454501266c (diff) | |
| parent | 19d6c13b56a78b3757e747f469285c2a546d634a (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'include/video/pxa168fb.h')
| -rw-r--r-- | include/video/pxa168fb.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/video/pxa168fb.h b/include/video/pxa168fb.h index b5cc72fe0461..8c2f385a90ea 100644 --- a/include/video/pxa168fb.h +++ b/include/video/pxa168fb.h | |||
| @@ -117,8 +117,6 @@ struct pxa168fb_mach_info { | |||
| 117 | unsigned invert_composite_blank:1; | 117 | unsigned invert_composite_blank:1; |
| 118 | unsigned invert_pix_val_ena:1; | 118 | unsigned invert_pix_val_ena:1; |
| 119 | unsigned invert_pixclock:1; | 119 | unsigned invert_pixclock:1; |
| 120 | unsigned invert_vsync:1; | ||
| 121 | unsigned invert_hsync:1; | ||
| 122 | unsigned panel_rbswap:1; | 120 | unsigned panel_rbswap:1; |
| 123 | unsigned active:1; | 121 | unsigned active:1; |
| 124 | unsigned enable_lcd:1; | 122 | unsigned enable_lcd:1; |