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 tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
at91sam9g45.dtsi
diff --git
a/arch/arm/boot/dts/at91sam9g45.dtsi
b/arch/arm/boot/dts/at91sam9g45.dtsi
index 56b66a795df73f10d9efb0d384b018e8d487db6e..70e59c5ceb2f7a56c5bd7e35d0cc9b34cf6a06a4 100644
(file)
--- a/
arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/
arch/arm/boot/dts/at91sam9g45.dtsi
@@
-956,7
+956,7
@@
};
macb0: ethernet@fffbc000 {
- compatible = "cdns,at
32ap700
0-macb", "cdns,macb";
+ compatible = "cdns,at
91sam926
0-macb", "cdns,macb";
reg = <0xfffbc000 0x100>;
interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
pinctrl-names = "default";