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 branch 'next' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
omap3-overo-summit-common.dtsi
diff --git
a/arch/arm/boot/dts/omap3-overo-summit-common.dtsi
b/arch/arm/boot/dts/omap3-overo-summit-common.dtsi
index 999d1cd4a09faeffba6e392453ba078a951cb63a..0ac97ba985499902ea04bedccb7c597919e4cd79 100644
(file)
--- a/
arch/arm/boot/dts/omap3-overo-summit-common.dtsi
+++ b/
arch/arm/boot/dts/omap3-overo-summit-common.dtsi
@@
-11,6
+11,7
@@
*/
#include "omap3-overo-common-peripherals.dtsi"
+#include "omap3-overo-common-dvi.dtsi"
/ {
leds {