diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-01-23 11:31:34 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-01-23 11:31:34 +0400 |
commit | e152f18027552eb34006b35347e72bc805783027 (patch) | |
tree | ac9765e68597c08c24de447f46bb3e04d9881e1b /arch/arm/boot/dts/kirkwood.dtsi | |
parent | 49ba4f94bddb7f5272c4596d505f94355cc3fbd2 (diff) | |
parent | 42c364ace52ae6b4699105b39f2559c256b6cd4c (diff) | |
download | linux-e152f18027552eb34006b35347e72bc805783027.tar.xz |
Merge branch 'for-linus' into for-next
This is a preliminary merge before the upcoming merge of generic parser
branch.
Diffstat (limited to 'arch/arm/boot/dts/kirkwood.dtsi')
-rw-r--r-- | arch/arm/boot/dts/kirkwood.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index 7735cee4a9c6..110d6cbb795b 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -144,6 +144,7 @@ compatible = "marvell,orion-ehci"; reg = <0x50000 0x1000>; interrupts = <19>; + clocks = <&gate_clk 3>; status = "okay"; }; |