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 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
dra7.dtsi
diff --git
a/arch/arm/boot/dts/dra7.dtsi
b/arch/arm/boot/dts/dra7.dtsi
index 63f8b007bdc51358d53cdd57b58c8fe1a21f617a..5827fedafd43d58a00169a4186cbb595d6f11234 100644
(file)
--- a/
arch/arm/boot/dts/dra7.dtsi
+++ b/
arch/arm/boot/dts/dra7.dtsi
@@
-1111,7
+1111,6
@@
"wkupclk", "refclk",
"div-clk", "phy-div";
#phy-cells = <0>;
- id = <1>;
ti,hwmods = "pcie1-phy";
};
@@
-1132,7
+1131,6
@@
"div-clk", "phy-div";
#phy-cells = <0>;
ti,hwmods = "pcie2-phy";
- id = <2>;
status = "disabled";
};
};