git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
Documentation
/
devicetree
/
bindings
/
clock
/
imx25-clock.txt
diff --git
a/Documentation/devicetree/bindings/clock/imx25-clock.txt
b/Documentation/devicetree/bindings/clock/imx25-clock.txt
index
c2a3525
..
db4f2f0
100644
(file)
--- a/
Documentation/devicetree/bindings/clock/imx25-clock.txt
+++ b/
Documentation/devicetree/bindings/clock/imx25-clock.txt
@@
-146,10
+146,6
@@
clks: ccm@53f80000 {
compatible = "fsl,imx25-ccm";
reg = <0x53f80000 0x4000>;
interrupts = <31>;
- clock-output-names = ...
- "uart_ipg",
- "uart_serial",
- ...;
};
uart1: serial@43f90000 {