git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.8-rc1' into staging/for_v3.9
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
board-devkit8000.c
diff --git
a/arch/arm/mach-omap2/board-devkit8000.c
b/arch/arm/mach-omap2/board-devkit8000.c
index 7667eb749522dc5ff568a380ee1dfaa87efe5cc1..12865af25d3a865b351e8dff3b8cb5fc20649ca5 100644
(file)
--- a/
arch/arm/mach-omap2/board-devkit8000.c
+++ b/
arch/arm/mach-omap2/board-devkit8000.c
@@
-141,6
+141,7
@@
static struct omap_dss_device devkit8000_lcd_device = {
static struct tfp410_platform_data dvi_panel = {
.power_down_gpio = -1,
+ .i2c_bus_num = 1,
};
static struct omap_dss_device devkit8000_dvi_device = {