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 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
ste-href-family-pinctrl.dtsi
diff --git
a/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi
b/arch/arm/boot/dts/ste-href-family-pinctrl.dtsi
index 86621196abdae1ba3b6bfd1a8d023957178f1e1d..2c382d274ff64c54b74c21219f9cb21bcac5b693 100644
(file)
--- a/
arch/arm/boot/dts/ste-href-family-pinctrl.dtsi
+++ b/
arch/arm/boot/dts/ste-href-family-pinctrl.dtsi
@@
-607,7
+607,6
@@
groups =
"lcdvsi0_a_1", /* VSI0 for LCD */
"lcd_d0_d7_a_1", /* Data lines */
- "lcd_d8_d11_a_1", /* TV-out */
"lcdvsi1_a_1"; /* VSI1 for HDMI */
};
default_mux2 {