summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/media/atmel-isi.txt
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-02-18 05:48:51 +0300
committerDavid S. Miller <davem@davemloft.net>2015-02-18 05:48:51 +0300
commitfece13ca005a5f559147e9424321f4b5e01272b4 (patch)
tree54e762e70afb664d14152e6bcf89a48be3fb9c13 /Documentation/devicetree/bindings/media/atmel-isi.txt
parent855e7e7174bade3f2b63077a81eea5aab525dbf6 (diff)
parentf5af19d10d151c5a2afae3306578f485c244db25 (diff)
downloadlinux-fece13ca005a5f559147e9424321f4b5e01272b4.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'Documentation/devicetree/bindings/media/atmel-isi.txt')
-rw-r--r--Documentation/devicetree/bindings/media/atmel-isi.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/media/atmel-isi.txt b/Documentation/devicetree/bindings/media/atmel-isi.txt
index 17e71b7b44c6..251f008f220c 100644
--- a/Documentation/devicetree/bindings/media/atmel-isi.txt
+++ b/Documentation/devicetree/bindings/media/atmel-isi.txt
@@ -38,7 +38,7 @@ Example:
i2c1: i2c@f0018000 {
ov2640: camera@0x30 {
- compatible = "omnivision,ov2640";
+ compatible = "ovti,ov2640";
reg = <0x30>;
port {