diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2007-10-16 04:28:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:16 -0400 |
commit | 1f4115376c488d3bb3490259ae5b2c3b035760a5 (patch) | |
tree | 26d93492e72aed892d1d752ce5082508fd2bd703 /arch/arm/mach-s3c2410/mach-h1940.c | |
parent | 09fe75f6f934597f765748342ca6fb378ee7ecdb (diff) |
s3c2410fb: add margin fields to s3c2410fb_display
This patch adds margins fields to the s3c2410fb_display
structure. It also sets display type and horizontal
margins in all platform files that use the s3c2410fb
driver.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-h1940.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index ab04b2961d6c..372caa289f2b 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c | |||
@@ -156,11 +156,14 @@ static struct s3c2410fb_display h1940_lcd __initdata = { | |||
156 | S3C2410_LCDCON5_HWSWP, | 156 | S3C2410_LCDCON5_HWSWP, |
157 | }, | 157 | }, |
158 | 158 | ||
159 | .type = S3C2410_LCDCON1_TFT, | ||
159 | .width = 240, | 160 | .width = 240, |
160 | .height = 320, | 161 | .height = 320, |
161 | .xres = 240, | 162 | .xres = 240, |
162 | .yres = 320, | 163 | .yres = 320, |
163 | .bpp = 16, | 164 | .bpp = 16, |
165 | .left_margin = 20, | ||
166 | .right_margin = 8, | ||
164 | }; | 167 | }; |
165 | 168 | ||
166 | static struct s3c2410fb_mach_info h1940_fb_info __initdata = { | 169 | static struct s3c2410fb_mach_info h1940_fb_info __initdata = { |