projects
/
firefly-linux-kernel-4.4.55.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
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-at91
/
board-sam9rlek.c
diff --git
a/arch/arm/mach-at91/board-sam9rlek.c
b/arch/arm/mach-at91/board-sam9rlek.c
index b2b748239f365ab77627a6d96a7c442be91fd161..0e943a2d95029e2cd44a63e4bad91243a4239e56 100644
(file)
--- a/
arch/arm/mach-at91/board-sam9rlek.c
+++ b/
arch/arm/mach-at91/board-sam9rlek.c
@@
-149,7
+149,7
@@
static struct fb_videomode at91_tft_vga_modes[] = {
.xres = 240, .yres = 320,
.pixclock = KHZ2PICOS(4965),
- .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,