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 'nfs-for-4.18-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6q-novena.dts
diff --git
a/arch/arm/boot/dts/imx6q-novena.dts
b/arch/arm/boot/dts/imx6q-novena.dts
index 52f39371188dfab69d5b991d6b2dadbe6c87fbae..fcd824dc485bb6009ea751d38b8b703f29e61667 100644
(file)
--- a/
arch/arm/boot/dts/imx6q-novena.dts
+++ b/
arch/arm/boot/dts/imx6q-novena.dts
@@
-268,8
+268,6
@@
touch: stmpe811@44 {
compatible = "st,stmpe811";
reg = <0x44>;
- #address-cells = <1>;
- #size-cells = <0>;
irq-gpio = <&gpio5 13 GPIO_ACTIVE_HIGH>;
id = <0>;
blocks = <0x5>;