projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v3.2-rc2' into fbdev-next
[cascardo/linux.git]
/
arch
/
arm
/
mach-at91
/
board-neocore926.c
diff --git
a/arch/arm/mach-at91/board-neocore926.c
b/arch/arm/mach-at91/board-neocore926.c
index
ef816c1
..
190dc19
100644
(file)
--- a/
arch/arm/mach-at91/board-neocore926.c
+++ b/
arch/arm/mach-at91/board-neocore926.c
@@
-230,7
+230,7
@@
static struct fb_videomode at91_tft_vga_modes[] = {
.xres = 240, .yres = 320,
.pixclock = KHZ2PICOS(5000),
- .left_margin = 1, .right_margin = 3
3
,
+ .left_margin = 1, .right_margin = 3
4
,
.upper_margin = 1, .lower_margin = 0,
.hsync_len = 5, .vsync_len = 1,
projects / cascardo / linux.git / blobdiff