projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski...
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
sama5d2.dtsi
diff --git
a/arch/arm/boot/dts/sama5d2.dtsi
b/arch/arm/boot/dts/sama5d2.dtsi
index 78996bdbd3df38c30fb0a0051cd0db3e9a9249eb..9817090c1b731540a2dcd4cb3dc480608040fbfa 100644
(file)
--- a/
arch/arm/boot/dts/sama5d2.dtsi
+++ b/
arch/arm/boot/dts/sama5d2.dtsi
@@
-280,7
+280,7
@@
status = "disabled";
nfc@c0000000 {
status = "disabled";
nfc@c0000000 {
- compatible = "atmel,sama5d
4
-nfc";
+ compatible = "atmel,sama5d
3
-nfc";
#address-cells = <1>;
#size-cells = <1>;
reg = < /* NFC Command Registers */
#address-cells = <1>;
#size-cells = <1>;
reg = < /* NFC Command Registers */