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 remote-tracking branch 'regmap/fix/rbtree' into regmap-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
at91-qil_a9260.dts
diff --git
a/arch/arm/boot/dts/at91-qil_a9260.dts
b/arch/arm/boot/dts/at91-qil_a9260.dts
index 5ad3d90f9d39c2c33fd8aed3e8677bb120269431..8f019184fccf0b96b2b436a8a48c58bf00a03dfe 100644
(file)
--- a/
arch/arm/boot/dts/at91-qil_a9260.dts
+++ b/
arch/arm/boot/dts/at91-qil_a9260.dts
@@
-178,7
+178,7
@@
};
};
- i2c
@
0 {
+ i2c
-gpio-
0 {
status = "okay";
};
};