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 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
socfpga.dtsi
diff --git
a/arch/arm/boot/dts/socfpga.dtsi
b/arch/arm/boot/dts/socfpga.dtsi
index b3ff5a86efdbec20934b9a489395c312feb1aca5..2d300396f0edd49d16ae46b8949801071438d699 100644
(file)
--- a/
arch/arm/boot/dts/socfpga.dtsi
+++ b/
arch/arm/boot/dts/socfpga.dtsi
@@
-22,8
+22,6
@@
#size-cells = <1>;
aliases {
- ethernet0 = &gmac0;
- ethernet1 = &gmac1;
serial0 = &uart0;
serial1 = &uart1;
timer0 = &timer0;